Skip to content

Commit bd88f6c

Browse files
author
doruk.ozturk
committed
Compute metadata for the earthquakes layers
1 parent 80a478e commit bd88f6c

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

dataqs/helpers.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,8 @@ def get_vector_layer_info(geojson):
432432
layer = dataSource.GetLayer()
433433
geom = {0: 'polygon', 1: 'point', 2: 'line',
434434
3: 'polygon', 4: 'polygon', 5: 'polygon',
435-
6: 'polygon'}
435+
6: 'polygon', -2147483647: 'point'}
436+
436437
subType = geom[layer.GetGeomType()]
437438
count = layer.GetFeatureCount()
438439
numFields = _getNumericFields(layer)

dataqs/usgs_quakes/usgs_quakes.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
from django.db import connections
2626
from dataqs.processor_base import GeoDataProcessor, DEFAULT_WORKSPACE
2727
from dataqs.helpers import postgres_query, ogr2ogr_exec, layer_exists, \
28-
style_exists
28+
style_exists, get_vector_layer_info
2929
from geonode.geoserver.helpers import ogc_server_settings
3030

3131
logger = logging.getLogger("dataqs.processors")
@@ -106,7 +106,8 @@ def run(self, rss_file=None):
106106
"%Y-%m-%d %H:%M:%S")
107107
with open(rss_file, 'w') as modified_file:
108108
json.dump(json_data, modified_file)
109-
109+
info = get_vector_layer_info(rss_file)
110+
layer_info = 'layer_info:{}'.format(json.dumps(info))
110111
db = ogc_server_settings.datastore_db
111112
for table, title in zip(self.tables, self.titles):
112113
ogr2ogr_exec("-append -skipfailures -f PostgreSQL \
@@ -132,7 +133,8 @@ def run(self, rss_file=None):
132133
title="Earthquakes - {}".format(title),
133134
description=self.description,
134135
store=datastore,
135-
extra_keywords=['category:Geoscientific Information'])
136+
extra_keywords=['category:Geoscientific Information',
137+
layer_info])
136138
self.truncate_gs_cache(table)
137139
self.purge_old_data()
138140
self.cleanup()

0 commit comments

Comments
 (0)