Cleaner (and safer) way to generate JSON - add a get-marker view - allow to display only one marker (and no category) with permalinks

1 files changed, 27 insertions, 1 deletions

diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index 9eaf4a0..77c27b0 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -441,6 +441,22 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
                     methods.routingAddStep();
                 }
             }
+
+            // verify that the initial display_feature is displayed
+            if (settings.display_feature){
+                var is_displayed = false;
+                for(j=0; j<settings.layerMarkers.markers.length;j++){
+                    var c_marker = settings.layerMarkers.markers[j];
+                    if(c_marker.pk == settings.display_feature){
+                        is_displayed = true;
+                    }
+                }
+                if (!is_displayed){
+                    methods.loadMarker(settings.display_feature);
+                }
+            }
+
+
             methods.preload_images();
         }, // end of init
         /* Preload icons */
@@ -581,6 +597,15 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
                 $('#chimere_map_menu').css('left', offsetX);
             }
         },
+        loadMarker: function(object_id) {
+            var uri = extra_url + "get-marker/" + object_id;
+            $.ajax({url: uri,
+                    dataType: "json",
+                    success: function (data) {
+                        for (idx in data) methods.addMarker(data[idx]);
+                    }
+            });
+        },
         /*
         * Load markers and route from DB
         */
@@ -1567,9 +1592,10 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
                 var c_marker = settings.layerMarkers.markers[j];
                 if(c_marker.pk == feature_pk){
                     c_marker.events.triggerEvent('click');
-                    return
+                    return true
                 }
             }
+            return false;
             //feature.markerClick();
             //OpenLayers.Popup.popupSelect.clickFeature(feature);
             /*