Changeset 940336

Timestamp:

06/29/2014 11:44:59 AM (12 years ago)

Author:

der_maddis

Message:

added startendsection, fixed bugs, added zoomlevel shortcode

Location:

wp-travelermap/trunk

Files:

• admin/js/travelermap-admin.js (modified) (3 diffs)
• admin/travelermap-editmap.php (modified) (1 diff)
• admin/travelermap-upgrade.php (modified) (2 diffs)
• frontend/js/travelermap-frontend.js (modified) (8 diffs)
• frontend/travelermap-frontend.php (modified) (2 diffs)
• media/tm-admin.css (modified) (2 diffs)
• readme.txt (modified) (4 diffs)
• wp-travelermap.php (modified) (2 diffs)

wp-travelermap/trunk/admin/js/travelermap-admin.js

@@ -179 +179 @@
                 $('#tm_place_at_address').prop('disabled', false);
                 $('#tm_save_changes').prop('disabled', false);
-            } else if (data.type === 'endsection') {
+            } else if (data.type === 'endsection' || data.type === 'startendsection') {
                 $('#tm_type').prop('disabled', false);
                 $('#tm_title').prop('disabled', false);
@@ -219 +219 @@
                 "departure": $('#tm_departure').val() !== '' ? Date.parse($('#tm_departure').val()) : null
             };
-            if (data.type === 'startsection' || data.type === 'endsection' || data.type === 'waypoint') {
+            if (data.type === 'startsection' || data.type === 'endsection' || data.type === 'startendsection' || data.type === 'waypoint') {
                 data.excludeFromPath = false;
                 $('#tm_excludefrompath').prop('checked', data.excludeFromPath);
@@ -232 +232 @@
             $(_currentSelection).removeClass('post');
             $(_currentSelection).removeClass('startsection');
+            $(_currentSelection).removeClass('startendsection');
             $(_currentSelection).removeClass('endsection');
 

wp-travelermap/trunk/admin/travelermap-editmap.php

@@ -145 +145 @@
                 <option value="waypoint">Waypoint</option>
                 <option value="startsection">Start Section</option>
+                <option value="startendsection">Start-End Section</option>
                 <option value="endsection">End Section</option>
             </select><br />

wp-travelermap/trunk/admin/travelermap-upgrade.php

@@ -30 +30 @@
         travelermap_upgrade_1_0_0_to_1_1_0();
     }
+    if( version_compare($currentVersion, '1.2.0', '<')) {
+        travelermap_upgrade_1_1_0_to_1_2_0();
+    }
 }
 
@@ -41 +44 @@
     }
 
-    update_option("travelermap_version", TM_VERSION);
-    update_option("travelermap_db_version", TM_VERSION);
+    update_option("travelermap_version", '1.1.0');
+    update_option("travelermap_db_version", '1.1.0');
+
+}
+
+function travelermap_upgrade_1_1_0_to_1_2_0() {
+    $settings = get_option('traverlermap_settings');
+    
+    if (!$settings) {
+        $settings = array(
+        );
+        update_option('travelermap_settings', $settings);
+    }
+
+    update_option("travelermap_version", '1.2.0');
+    update_option("travelermap_db_version", '1.2.0');
 
 }

wp-travelermap/trunk/frontend/js/travelermap-frontend.js

@@ -38 +38 @@
                 height: 400,
                 spinner: true,
-                dateFormat: "dd.MM.yyyy"
+                dateFormat: "dd.MM.yyyy",
+                zoomLevel: 3
             };
             
@@ -72 +73 @@
                 }
                 
-                _map = L.map(_mapWrapper[0]).setView([0,0], 3);;
+                _map = L.map(_mapWrapper[0]).setView([0,0], _mapOptions.zoomLevel);;
                 _map.on('popupopen', function(e) {
                     var px = _map.project(e.popup._latlng);
@@ -226 +227 @@
                         currentLine.bindPopup(feature.title);
                         currentLine['tm_data'] = feature;
+                        feature['_lf_object'] = currentLine;
                         group.addLayer(currentLine);
-                        feature['_lf_object'] = currentLine;
                         currentLine = L.geodesicPolyline([],{color:lineColor});
                         currentLine.addLatLng([feature.lat, feature.lng]); //add as starting point
@@ -237 +238 @@
                             }
                         }
+                    } else if(feature.type === 'startendsection') {
+                        currentLine.addLatLng([feature.lat, feature.lng]);
+                        currentLine.bindPopup(feature.title);
+                        currentLine['tm_data'] = feature;
+                        group.addLayer(currentLine);
+                        feature['_lf_object'] = currentLine;
+                        currentLine = L.geodesicPolyline([],{color:lineColor});
+                        currentLine.on('mouseover', function(evt) {
+                            evt.target.setStyle({opacity: 1});
+                        });
+                        currentLine.on('mouseout', function(evt) {
+                            evt.target.setStyle({opacity: 0.5});
+                        });
+                        currentLine.on('popupopen', function(evt) {
+                            evt.target.setStyle({opacity: 1});
+                        });
+                        currentLine.on('popupclose', function(evt) {
+                            evt.target.setStyle({opacity: 0.5});
+                        });
+                        currentLine.addLatLng([feature.lat, feature.lng]); //add as starting point
+                        var nextPoint = _findNextWaypointMarker(data,i+1);
+                        if(nextPoint) {
+                            if(nextPoint.arrival && nextPoint.arrival >= new Date().getTime()) {
+                                isInFuture = true;
+                            }
+                        }
                     }
                     
@@ -249 +276 @@
             function _findStartSection(data, start) {
                 for(var i = start; i >= 0; i--) {
-                    if(data[i].type === 'startsection') {
+                    if(data[i].type === 'startsection' || data[i].type === 'startendsection') {
+                        return data[i];
+                    }
+                }
+                return null;
+            }
+
+            function _findEndSection(data, start) {
+                for(var i = start; i < data.length; i++) {
+                    if(data[i].type === 'startendsection' || data[i].type === 'endsection') {
                         return data[i];
                     }
@@ -258 +294 @@
             function _findNextWaypointMarker(data, start) {
                 for(var i = start; i < data.length; i++) {
-                    if((data[i].type === "waypoint" || data[i].type === "startsection" || data[i].type === "endsection" || data[i].type==='marker' || data[i].type === 'media' || data[i].type === 'post') && !data[i].excludeFromPath) {
+                    if((data[i].type === "waypoint" || data[i].type === "startsection" || data[i].type === "startendsection" || data[i].type === "endsection" || data[i].type==='marker' || data[i].type === 'media' || data[i].type === 'post') && !data[i].excludeFromPath) {
                         return data[i];
                     }
@@ -278 +314 @@
                             markerLayer.addLayer(wp);
                         }
-                    } else if(feature.type === 'startsection' || feature.type === 'endsection') {
+                    } else if(feature.type === 'startsection' || feature.type === 'endsection' || feature.type === 'startendsection') {
                         var wp = L.circleMarker([feature.lat, feature.lng], {radius: 5, fillOpacity:1, color:lineColor});
                         if(feature.title) {
@@ -317 +353 @@
                 }
                 var dateInfo = '<span>';
-                if(feature.type === 'endsection') {
-                    var start = _findStartSection(data, position);
-                    if(start && start.arrival) {
+                if(feature.type === 'endsection' || feature.type === 'startendsection') {
+                    var start = _findStartSection(data, position-1);
+                    if(start && start.departure) {
+                        dateInfo += "Start: " + $.format.date(start.departure, _mapOptions.dateFormat) + ' | ';
+                    } else if(start && start.arrival) {
                         dateInfo += "Start: " + $.format.date(start.arrival, _mapOptions.dateFormat) + ' | ';
                     }
-                    if(feature.departure) {
+                    if(feature.arrival) {
+                        dateInfo += "End: " + $.format.date(feature.arrival, _mapOptions.dateFormat) + ' | ';
+                    } else if(feature.departure) {
                         dateInfo += "End: " + $.format.date(feature.departure, _mapOptions.dateFormat) + ' | ';
                     }
-
                 } else {
                     if(feature.date) {

wp-travelermap/trunk/frontend/travelermap-frontend.php

@@ -39 +39 @@
         "id"      => '',
         "connectmaps" => 'false',
-        'spinner' => 'true'
+        'spinner' => 'true',
+        'zoomlevel' => '3'
     ), $atts ) );
     
@@ -72 +73 @@
     $output .= "$('#tm_map_$map_id')";
     $output .= ",";
-    $output .= "{connectMaps:$connectmaps, height:$height, spinner:$spinner, dateFormat:'$dateFormat'}";
+    $output .= "{connectMaps:$connectmaps, height:$height, spinner:$spinner, dateFormat:'$dateFormat', zoomLevel:$zoomlevel}";
     $output .= ');';
     $output .= '});';

wp-travelermap/trunk/media/tm-admin.css

@@ -104 +104 @@
 }
 
+ul#tm_pointlist > li.startendsection {
+    border: 1px solid #000;
+}
+
 ul#tm_pointlist > li.startsection > i:before {
     content: "\f105";
@@ -110 +114 @@
 ul#tm_pointlist > li.endsection > i:before {
     content: "\f104";
+}
+
+ul#tm_pointlist > li.startendsection > i:before {
+    content: "\f101";
 }
 

wp-travelermap/trunk/readme.txt

@@ -4 +4 @@
 Tags: travel, map, waypoints
 Requires at least: 3.9.0
-Tested up to: 3.9.0
-Stable tag: 1.1.0
+Tested up to: 3.9.1
+Stable tag: 1.2.0
 License: MIT
 License URI: http://opensource.org/licenses/MIT
@@ -13 +13 @@
 == Description ==
 
-This Pluigin allow the creation of travel maps with routes and point of interests.
+This plugin allows the creation of travel maps with routes and point of interests.
 The points or route section can be linked with posts or media attachments.
 
@@ -20 +20 @@
 Additional parameters for the shortcode are: connectmaps="true|false" to connect the maps in the order
 specified in the comma separated id list and spinner="true|false" to disable the spinner to navigate
-through markers.
+through markers, zoomlevel="0-16" to set the initial zoom level (0 min, 16 max level)
 
 example:
@@ -51 +51 @@
 
 == Changelog ==
+
+= 1.2.0 =
+* added zoomlevel to shortcode to set initial zoom level
+* added startendsection marker type to create consecutive sections
+* fixed some bugs
 
 = 1.1.0 =

wp-travelermap/trunk/wp-travelermap.php

@@ -4 +4 @@
 Plugin URI: http://bitschubser.org/projects/wp-travelermap
 Description: A simple Plugin to create travel routes and manage maps
-Version: 1.1.0
+Version: 1.2.0
 Author: Mathis Zeiher
 Author URI: http://bitschubser.org/
@@ -32 +32 @@
 
 if ( ! defined( 'TM_VERSION' ) )    
-    define( 'TM_VERSION', '1.1.0' );
+    define( 'TM_VERSION', '1.2.0' );
     
 if ( ! defined( 'TM_URL' ) )