rename marker files

diff --git a/COPYING.txt b/COPYING.txt
index 67f5285fc9de7debeb7fda6f3f8a64cf977c5f39..42134a96bc1347f3ab87c02399e7a9d3d9fba0e3 100644 (file)
--- a/COPYING.txt
+++ b/COPYING.txt
@@ -5,6 +5,9 @@
 - OpenLayers is available under a BSD-style License. A copy of its license
   should be available at http://svn.openlayers.org/trunk/openlayers/license.txt
 
 - OpenLayers is available under a BSD-style License. A copy of its license
   should be available at http://svn.openlayers.org/trunk/openlayers/license.txt
 

+- marker-normal.png, marker-selected.png and marker-temp.png are part of
+  Openlayers.
+

 - Jquery is available under both MIT and GPL licences. More informations can be
   found at http://docs.jquery.com/Licensing
 
 - Jquery is available under both MIT and GPL licences. More informations can be
   found at http://docs.jquery.com/Licensing
 

diff --git a/build.sh b/build.sh
index 764f1c6d708bf249107f78f7c4ff09020656f82c..6cfb0692378d97e715f14ed72b5838ecec6ac250 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -30,13 +30,10 @@ cp -RLp openlayers/build/OpenLayers.js $DESTDIR/openlayers/
 # openlayers images
 mkdir $DESTDIR/openlayers/img
 for file in east-mini.png \
 # openlayers images
 mkdir $DESTDIR/openlayers/img
 for file in east-mini.png \

-            marker-gold.png \

             north-mini.png \
             blank.gif \
             west-mini.png \
             zoom-plus-mini.png \
             north-mini.png \
             blank.gif \
             west-mini.png \
             zoom-plus-mini.png \

-            marker-blue.png \
-            marker-green.png \

             south-mini.png \
             zoom-minus-mini.png \
             zoom-world-mini.png; do
             south-mini.png \
             zoom-minus-mini.png \
             zoom-world-mini.png; do

diff --git a/js/admin.js b/js/admin.js
index c070ff2f8782991412b02fe7098df7ed2be7c3e0..259c914ae8c446165e8a5c613463687845c5612c 100644 (file)
--- a/js/admin.js
+++ b/js/admin.js
@@ -56,12 +56,10 @@ OpenLayers.Control.SypDragFeature = OpenLayers.Class (OpenLayers.Control.DragFea
 
 var Admin = {
     Settings: {
 
 var Admin = {
     Settings: {

-        MARKER_ICON: "openlayers/img/marker-blue.png",
-        MARKER_ICON_HEIGHT: 25,
-        MARKER_SELECT_ICON: "openlayers/img/marker-green.png",
-        MARKER_SELECT_ICON_HEIGHT: 25,
-        MARKER_TEMPORARY_ICON: "openlayers/img/marker-gold.png",
-        MARKER_TEMPORARY_ICON_HEIGHT: 25
+        MARKER_ICON: "media/marker-normal.png",
+        MARKER_SELECT_ICON: "media/marker-selected.png",
+        MARKER_TEMPORARY_ICON: "media/marker-temp.png",
+        MARKER_HEIGHT: 25

     },
 
     map: null,
     },
 
     map: null,


@@ -137,18 +135,15 @@ var Admin = {
         var styleMap = new OpenLayers.StyleMap (
                         {"default": {
                              externalGraphic: this.Settings.MARKER_ICON,
         var styleMap = new OpenLayers.StyleMap (
                         {"default": {
                              externalGraphic: this.Settings.MARKER_ICON,

-                             graphicHeight: this.Settings.MARKER_ICON_HEIGHT
-                                                  || 32 
+                             graphicHeight: this.Settings.MARKER_HEIGHT || 32 

                                 },
                          "temporary": { 
                              externalGraphic: this.Settings.MARKER_TEMPORARY_ICON,
                                 },
                          "temporary": { 
                              externalGraphic: this.Settings.MARKER_TEMPORARY_ICON,

-                             graphicHeight: this.Settings.MARKER_TEMPORARY_ICON_HEIGHT
-                                                  || 32 
+                             graphicHeight: this.Settings.MARKER_HEIGHT || 32 

                          },
                          "select": { 
                              externalGraphic: this.Settings.MARKER_SELECT_ICON,
                          },
                          "select": { 
                              externalGraphic: this.Settings.MARKER_SELECT_ICON,

-                             graphicHeight: this.Settings.MARKER_SELECT_ICON_HEIGHT
-                                                  || 32 
+                             graphicHeight: this.Settings.MARKER_HEIGHT || 32 

                     }});
 
         var layer = new OpenLayers.Layer.GML("KML", "items.php", 
                     }});
 
         var layer = new OpenLayers.Layer.GML("KML", "items.php", 

diff --git a/js/syp.js b/js/syp.js
index d8a54b5d5a59611d44cb4663e5dbec309161abb7..cf92ef51f9601ba8fa48478b62f51467736e4109 100644 (file)
--- a/js/syp.js
+++ b/js/syp.js
@@ -18,10 +18,9 @@ OpenLayers.Control.SypAttribution = OpenLayers.Class (OpenLayers.Control.Attribu
 
 var SYP = {
     Settings: {
 
 var SYP = {
     Settings: {

-        MARKER_ICON: "openlayers/img/marker-blue.png",
-        MARKER_ICON_HEIGHT: 25,
-        MARKER_SELECT_ICON: "openlayers/img/marker-green.png",
-        MARKER_SELECT_ICON_HEIGHT: 25
+        MARKER_ICON: "media/marker-normal.png",
+        MARKER_SELECT_ICON: "media/marker-selected.png",
+        MARKER_HEIGHT: 25

     },
 
     map: null,
     },
 
     map: null,


@@ -77,7 +76,7 @@ var SYP = {
         }, {
             context: {
                 height: function(feature) {
         }, {
             context: {
                 height: function(feature) {

-                    var defaultHeight = SYP.Settings.MARKER_ICON_HEIGHT || 32;
+                    var defaultHeight = SYP.Settings.MARKER_HEIGHT || 32;

                     var increase = 4 * (feature.attributes.count - 1);
                     return Math.min(defaultHeight + increase, 50);
                 }
                     var increase = 4 * (feature.attributes.count - 1);
                     return Math.min(defaultHeight + increase, 50);
                 }


@@ -85,7 +84,7 @@ var SYP = {
         });
         var selectStyle = new OpenLayers.Style({
             externalGraphic: this.Settings.MARKER_SELECT_ICON,
         });
         var selectStyle = new OpenLayers.Style({
             externalGraphic: this.Settings.MARKER_SELECT_ICON,

-            graphicHeight: this.Settings.MARKER_SELECT_ICON_HEIGHT || 32 
+            graphicHeight: this.Settings.MARKER_HEIGHT || 32 

         });
         var styleMap = new OpenLayers.StyleMap (
                         {"default": defaultStyle,
         });
         var styleMap = new OpenLayers.StyleMap (
                         {"default": defaultStyle,

diff --git a/media/marker-normal.png b/media/marker-normal.png
new file mode 100644 (file)
index 0000000..83a90b4
Binary files /dev/null and b/media/marker-normal.png differ

diff --git a/media/marker-selected.png b/media/marker-selected.png
new file mode 100644 (file)
index 0000000..17168f1
Binary files /dev/null and b/media/marker-selected.png differ

diff --git a/media/marker-temp.png b/media/marker-temp.png
new file mode 100644 (file)
index 0000000..2ff9ec5
Binary files /dev/null and b/media/marker-temp.png differ