Clean unused settings

4 files changed, 2 insertions, 12 deletions

diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index fe75c72..9e62055 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -220,7 +220,6 @@ var invisibleStyleIcon = new ol.style.Style({
             current_category: null, // To store the current category clicked in list
             current_routes_features: [], // To store the current routes find by routing
             itinerary_step_number:0, // current step number
-            icon_offset: [0, 0],
             edition: false, // edition mode
             edition_type: 'marker', // marker, route or polygon edition
             //default_icon: new OpenLayers.Icon(
@@ -1078,8 +1077,6 @@ var invisibleStyleIcon = new ol.style.Style({
                     var offset_y = -(radius + radius / 2);
                     var geom = feature.getGeometry();
                     methods.openPopup(feat, offset_x, offset_y, geom.getCoordinates());
-                    //.attributes.marker;
-                    //m.events.triggerEvent('click');
                     e.stopPropagation();
                     return false;
             });
diff --git a/chimere/templates/chimere/blocks/map.html b/chimere/templates/chimere/blocks/map.html
index 04cf56f..06e5269 100644
--- a/chimere/templates/chimere/blocks/map.html
+++ b/chimere/templates/chimere/blocks/map.html
@@ -63,7 +63,6 @@ $(function(){
     {% if p_routing_steps %}chimere_init_options["routing_steps_lonlat"] = [{{ p_routing_steps }}];{% endif %}
     {% if p_routing_transport %}chimere_init_options["routing_transport"] = "{{ p_routing_transport }}";{% endif %}
     {% if p_routing_speed %}chimere_init_options["routing_speed"] = "{{ p_routing_speed }}";{% endif %}
-    chimere_init_options["icon_offset"] = ({{icon_offset_x}}, {{icon_offset_y}});
     chimere_init_options["dynamic_categories"] = {{ dynamic_categories }};
     {% if p_display_submited %}chimere_init_options["display_submited"] = {{ p_display_submited }};{% endif %}
     chimere_init_options["checked_categories"] = [{% for cc in checked_categories %}{% if forloop.counter0 > 0 %}, {% endif %}{{cc}}{% endfor %}];
diff --git a/chimere/templatetags/chimere_tags.py b/chimere/templatetags/chimere_tags.py
index 460a6f8..27deebb 100644
--- a/chimere/templatetags/chimere_tags.py
+++ b/chimere/templatetags/chimere_tags.py
@@ -216,10 +216,6 @@ def map(context, map_id='map'):
     context_data = {'map_id': map_id,
                     "STATIC_URL": settings.STATIC_URL,
                     "enable_clustering": settings.CHIMERE_ENABLE_CLUSTERING}
-    context_data['icon_offset_x'] = settings.CHIMERE_ICON_OFFSET_X
-    context_data['icon_offset_y'] = settings.CHIMERE_ICON_OFFSET_Y
-    context_data['icon_width'] = settings.CHIMERE_ICON_WIDTH
-    context_data['icon_height'] = settings.CHIMERE_ICON_HEIGHT
     context_data['MOBILE'] = context['MOBILE']
     context_data['routing'] = 'true' \
         if hasattr(settings, 'CHIMERE_ENABLE_ROUTING') and \
diff --git a/chimere_example_project/settings.py b/chimere_example_project/settings.py
index 8ab1da4..901e3bb 100644
--- a/chimere_example_project/settings.py
+++ b/chimere_example_project/settings.py
@@ -62,10 +62,8 @@ CHIMERE_FEEDS = True
 # display a directory of items
 CHIMERE_DIRECTORY = True
 
-CHIMERE_ICON_WIDTH = 21
-CHIMERE_ICON_HEIGHT = 25
-CHIMERE_ICON_OFFSET_X = 10
-CHIMERE_ICON_OFFSET_Y = 25
+# content inside the popup or on a specific window
+CHIMERE_CONTENT_INSIDE_POPUP = False
 
 # display picture inside the description by default or inside a galery?
 CHIMERE_MINIATURE_BY_DEFAULT = False