Merge 7a85960 into c957f4d

dbca-wa · Aug 28, 2017 · 2e87a12 · 2e87a12
2 parents c957f4d + 7a85960
commit 2e87a12
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/prs2/referral/templates/referral/location_create.html b/prs2/referral/templates/referral/location_create.html
@@ -144,6 +144,9 @@ <h1>{{ title }}</h1>
 
     // Function to query Geoserver for the clicked-on location, return a feature and add it to locationsLayer.
     var queryCadastre = function(latlng) {
+        if (latlng == null) {
+            return;
+        }
         // Generate our CQL filter.
         var filter = 'INTERSECTS(wkb_geometry, POINT ({0} {1}))'.replace('{0}', latlng.lat).replace('{1}', latlng.lng);
         var parameters = L.Util.extend(cadastreWFSParams, {'cql_filter': filter});

diff --git a/prs2/referral/templates/referral/referral_detail.html b/prs2/referral/templates/referral/referral_detail.html
@@ -8,7 +8,7 @@
 {% if geojson_locations %}
 <link rel="stylesheet" type="text/css" href="//api.mapbox.com/mapbox.js/v3.1.1/mapbox.css" />
 <link rel="stylesheet" type="text/css" href="//api.mapbox.com/mapbox.js/plugins/leaflet-fullscreen/v1.0.1/leaflet.fullscreen.css" />
-<link rel="stylesheet" type="text/css" href="{% static 'leaflet-search/leaflet-search.css' %}" />
+<link rel="stylesheet" type="text/css" href="{% static 'css/leaflet-search.css' %}" />
 {% endif %}
 <link rel="stylesheet" type="text/css" href="//static.dbca.wa.gov.au/static/libs/dropzone/5.1.1/min/dropzone.min.css">
 <link rel="stylesheet" type="text/css" href="{% static 'css/prs_dropzone.css' %}" />
@@ -171,7 +171,7 @@ <h4>Key issues:</h4>
 {% if geojson_locations %}
 <script src="//api.mapbox.com/mapbox.js/v3.1.1/mapbox.js"></script>
 <script src="//api.mapbox.com/mapbox.js/plugins/leaflet-fullscreen/v1.0.1/Leaflet.fullscreen.min.js"></script>
-<script src="{% static 'leaflet-search/leaflet-search.min.js' %}"></script>
+<script src="{% static 'js/leaflet-search.min.js' %}"></script>
 <script>
     // Set global variables (needs to happen before loading referral_map.js)
     var geoserver_wms_url = '{{ geoserver_wms_url }}';