[worldmap-client] Improvements and fixes on the Gazetteer. Fixes #4072.

GeoNode · Nov 13, 2018 · 7df535c · 7df535c
1 parent 43685d7
commit 7df535c
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 11 deletions.
diff --git a/geonode/client/templates/worldmap/maps/map_worldmap.html b/geonode/client/templates/worldmap/maps/map_worldmap.html
@@ -9,7 +9,7 @@
 {% load static from staticfiles %}
 
 <script type="text/javascript">
-    OpenLayers.ImgPath = "{% static "worldmap_client/externals/openlayers/theme/default/img" %}";
+    OpenLayers.ImgPath = "{% static "worldmap_client/externals/openlayers/img/" %}";
     OpenLayers.Util.onImageLoadErrorColor = 1;
     OpenLayers.Util.onImageLoadErrorColor = 'transparent';
     OpenLayers.Util.onImageLoadError = function() {
@@ -194,7 +194,8 @@
                         title: '<span class="x-btn-text">{% trans 'Find Place' %}</span>',
                         iconCls: null,
                         toggleGroup: 'featureGroup',
-                        pressed: false
+                        pressed: false,
+                        services: '{{ GAZETTEER_SERVICES }}'
                     }
                     {% endif %}
                     {% if user.is_authenticated and DB_DATASTORE  %},
@@ -303,6 +304,7 @@
                 id: id
             })
         };
+
         {% endautoescape %}
     }
     $(document).ready(init);

diff --git a/geonode/context_processors.py b/geonode/context_processors.py
@@ -195,6 +195,12 @@ def resource_urls(request):
 
         defaults['USE_GAZETTEER'] = settings.USE_GAZETTEER
 
+        defaults['GAZETTEER_SERVICES'] = getattr(
+            settings,
+            'GAZETTEER_SERVICES',
+            'worldmap,geonames,nominatim'
+        )
+
         defaults['GOOGLE_API_KEY'] = settings.GOOGLE_API_KEY
 
         defaults['GOOGLE_MAPS_API_KEY'] = settings.GOOGLE_MAPS_API_KEY

diff --git a/geonode/contrib/worldmap/gazetteer/utils.py b/geonode/contrib/worldmap/gazetteer/utils.py
@@ -80,7 +80,6 @@ def getGazetteerResults(place_name, map=None, layer=None, start_date=None, end_d
         end_date: return only matches with an end date <= this value
         project: only return matches within the specified project
     """
-
     layers = []
     if map:
         mapObject = get_object_or_404(Map, pk=map)
@@ -426,7 +425,7 @@ def getConnection(layer_store=None):
 
 
 def getGeonamesResults(place_name):
-    g = geocoders.GeoNames(username=settings.GEONAMES_USER)
+    g = geocoders.GeoNames(username=settings.GAZETTEER_GEONAMES_USER)
     try:
         results = g.geocode(place_name, False)
         formatted_results = []

diff --git a/geonode/contrib/worldmap/gazetteer/views.py b/geonode/contrib/worldmap/gazetteer/views.py
@@ -24,10 +24,12 @@ def search(request, place_name, map=None, layer=None,
     if out_format not in ('xml', 'json'):
         out_format = 'json'
 
-    if place_name.isdigit():
-        posts = getGazetteerEntry(place_name)
-    else:
-        posts = getGazetteerResults(place_name, map, layer, start_date, end_date, project, user)
+    posts = []
+    if 'worldmap' in services:
+        if place_name.isdigit():
+            posts = getGazetteerEntry(place_name)
+        else:
+            posts = getGazetteerResults(place_name, map, layer, start_date, end_date, project, user)
     if services is not None:
         posts.extend(getExternalServiceResults(place_name, services))
     if out_format == 'json':

diff --git a/geonode/settings.py b/geonode/settings.py
@@ -1628,17 +1628,22 @@
 
 if USE_WORLDMAP:
     GEONODE_CLIENT_LOCATION = '/static/worldmap_client/'
-    GAZETTEER_DB_ALIAS = 'default'
     INSTALLED_APPS += (
             'geoexplorer-worldmap',
             'geonode.contrib.worldmap.gazetteer',
             'geonode.contrib.worldmap.wm_extra',
             'geonode.contrib.createlayer',
         )
+    # WorldMap Gazetter settings
+    USE_GAZETTEER = True
+    GAZETTEER_DB_ALIAS = 'default'
     GAZETTEER_FULLTEXTSEARCH = False
+    # external services to be used by the gazetteer
+    GAZETTEER_SERVICES = 'worldmap,geonames,nominatim'
+    # this is the GeoNames key which is needed by the WorldMap Gazetteer
+    GAZETTEER_GEONAMES_USER = os.getenv('GEONAMES_USER', 'your-key-here')
     WM_COPYRIGHT_URL = "http://gis.harvard.edu/"
     WM_COPYRIGHT_TEXT = "Center for Geographic Analysis"
-    USE_GAZETTEER = True
     DEFAULT_MAP_ABSTRACT = """
         <h3>The Harvard WorldMap Project</h3>
         <p>WorldMap is an open source web mapping system that is currently

diff --git a/requirements.txt b/requirements.txt
@@ -188,7 +188,7 @@ pycountry
 # required by worldmap
 datautil==0.4
 dicttoxml==1.7.4
-django-geoexplorer-worldmap==4.0.51
+django-geoexplorer-worldmap==4.0.52
 geopy==1.14.0
 
 #production