Fixes #273

GeoNode · Feb 15, 2018 · a521cfc · a521cfc
1 parent 7683603
commit a521cfc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/geonode/context_processors.py b/geonode/context_processors.py
@@ -161,11 +161,11 @@ def resource_urls(request):
     )
     if settings.USE_WORLDMAP:
         defaults['GEONODE_CLIENT_LOCATION'] = settings.GEONODE_CLIENT_LOCATION
+        # TODO disable DB_DATASTORE setting
         defaults['DB_DATASTORE'] = True
-        #defaults['DB_DATASTORE'] = settings.DB_DATASTORE
-        #defaults['HYPERMAP_REGISTRY_URL'] = settings.HYPERMAP_REGISTRY_URL
-        #defaults['MAPPROXY_URL'] = settings.MAPPROXY_URL
-        #defaults['SOLR_URL'] = settings.SOLR_URL
+        defaults['HYPERMAP_REGISTRY_URL'] = settings.HYPERMAP_REGISTRY_URL
+        defaults['MAPPROXY_URL'] = settings.HYPERMAP_REGISTRY_URL
+        defaults['SOLR_URL'] = settings.SOLR_URL
         defaults['USE_GAZETTEER'] = settings.USE_GAZETTEER
         # 'GOOGLE_API_KEY': settings.GOOGLE_API_KEY,
         # 'GOOGLE_MAPS_API_KEY': settings.GOOGLE_MAPS_API_KEY

diff --git a/geonode/contrib/worldmap/README.md b/geonode/contrib/worldmap/README.md
@@ -51,7 +51,7 @@ Now install GeoNode:
 
 You will use a geonode-project in order to separate the customization of your instance from GeoNode.
 
-Set the following variables as needed (change SITE_NAME and SERVER_IP s needed). Even better, create a file and source it:
+Set the following variables as needed (change SITE_NAME and SERVER_IP s needed. Also HYPERMAP_REGISTRY_URL and SOLR_URL may be different). Even better, create a file and source it:
 
     export SITE_NAME=worldmap
     export SERVER_IP=128.31.22.73
@@ -63,6 +63,8 @@ Set the following variables as needed (change SITE_NAME and SERVER_IP s needed).
     export ALLOWED_HOSTS="localhost, $SERVER_IP, "
     export GEOSERVER_LOCATION=http://localhost:8080/geoserver/
     export GEOSERVER_PUBLIC_LOCATION=http://$SERVER_IP/geoserver/
+    export HYPERMAP_REGISTRY_URL =http://localhost:8001/
+    export SOLR_URL =http://localhost:8983/solr/hypermap/select/
 
 Create your geonode project by using the WorldMap geonode-project as a template  (https://github.com/cga-harvard/geonode-project). Rename it to something meaningful (for example your web site name):
 

diff --git a/geonode/contrib/worldmap/wm_extra/templates/wm_extra/maps/worldmap.html b/geonode/contrib/worldmap/wm_extra/templates/wm_extra/maps/worldmap.html
@@ -181,7 +181,7 @@
 
             localCSWBaseUrl: "{{ CATALOGUE_BASE_URL }}",
             hypermapRegistryUrl: "{{ HYPERMAP_REGISTRY_URL }}",
-            mapProxyUrl: "{{ HYPERMAP_REGISTRY_URL }}",
+            mapProxyUrl: "{{ MAPPROXY_URL }}",
             solrUrl: "{{ SOLR_URL }}",
             username: "{{ user.username }}",
             csrfToken: "{{ csrf_token }}",