i.getMaxZoom()&&s>1)&&(this._zoom=i._limitZoom(this._zoom)),"center"===i.options.touchZoom){if(this._center=this._startLatLng,1===s)return}else{var r=n._add(o)._divideBy(2)._subtract(this._centerPoint);if(1===s&&0===r.x&&0===r.y)return;this._center=i.unproject(i.project(this._pinchStartLatLng,this._zoom).subtract(r),this._zoom)}this._moved||(i._moveStart(!0,!1),this._moved=!0),g(this._animRequest);var a=e(i._move,i,this._center,this._zoom,{pinch:!0,round:!1});this._animRequest=f(a,this,!0),Pt(t)}},_onTouchEnd:function(){this._moved&&this._zooming?(this._zooming=!1,g(this._animRequest),ft(document,"touchmove",this._onTouchMove),ft(document,"touchend",this._onTouchEnd),this._map.options.zoomAnimation?this._map._animateZoom(this._center,this._map._limitZoom(this._zoom),!0,this._map.options.zoomSnap):this._map._resetView(this._center,this._map._limitZoom(this._zoom))):this._zooming=!1}});be.addInitHook("addHandler","touchZoom",Zn),be.BoxZoom=bn,be.DoubleClickZoom=Tn,be.Drag=zn,be.Keyboard=Mn,be.ScrollWheelZoom=Cn,be.Tap=Sn,be.TouchZoom=Zn,Object.freeze=ti,t.version="1.4.0+HEAD.3337f36",t.Control=Te,t.control=ze,t.Browser=Qi,t.Evented=ci,t.Mixin=Be,t.Util=ui,t.Class=v,t.Handler=Ee,t.extend=i,t.bind=e,t.stamp=n,t.setOptions=l,t.DomEvent=Pe,t.DomUtil=ve,t.PosAnimation=Le,t.Draggable=Re,t.LineUtil=Ne,t.PolyUtil=De,t.Point=x,t.point=w,t.Bounds=P,t.bounds=b,t.Transformation=S,t.transformation=Z,t.Projection=He,t.LatLng=M,t.latLng=C,t.LatLngBounds=T,t.latLngBounds=z,t.CRS=di,t.GeoJSON=sn,t.geoJSON=Xt,t.geoJson=an,t.Layer=qe,t.LayerGroup=Ge,t.layerGroup=function(t,i){return new Ge(t,i)},t.FeatureGroup=Ke,t.featureGroup=function(t){return new Ke(t)},t.ImageOverlay=hn,t.imageOverlay=function(t,i,e){return new hn(t,i,e)},t.VideoOverlay=un,t.videoOverlay=function(t,i,e){return new un(t,i,e)},t.DivOverlay=ln,t.Popup=cn,t.popup=function(t,i){return new cn(t,i)},t.Tooltip=_n,t.tooltip=function(t,i){return new _n(t,i)},t.Icon=Ye,t.icon=function(t){return new Ye(t)},t.DivIcon=dn,t.divIcon=function(t){return new dn(t)},t.Marker=$e,t.marker=function(t,i){return new $e(t,i)},t.TileLayer=mn,t.tileLayer=Jt,t.GridLayer=pn,t.gridLayer=function(t){return new pn(t)},t.SVG=Pn,t.svg=Qt,t.Renderer=gn,t.Canvas=vn,t.canvas=$t,t.Path=Qe,t.CircleMarker=tn,t.circleMarker=function(t,i){return new tn(t,i)},t.Circle=en,t.circle=function(t,i,e){return new en(t,i,e)},t.Polyline=nn,t.polyline=function(t,i){return new nn(t,i)},t.Polygon=on,t.polygon=function(t,i){return new on(t,i)},t.Rectangle=Ln,t.rectangle=function(t,i){return new Ln(t,i)},t.Map=be,t.map=function(t,i){return new be(t,i)};var En=window.L;t.noConflict=function(){return window.L=En,this},window.L=t});
\ No newline at end of file
diff --git a/assets/js/locationpicker.jquery.js b/assets/js/locationpicker.jquery.js
deleted file mode 100755
index a46a28b0..00000000
--- a/assets/js/locationpicker.jquery.js
+++ /dev/null
@@ -1,400 +0,0 @@
-/*! jquery-locationpicker - v0.1.16 - 2017-10-02 */
-(function($) {
- function GMapContext(domElement, options) {
- var _map = new google.maps.Map(domElement, options);
- var _marker = new google.maps.Marker({
- position: new google.maps.LatLng(54.19335, -3.92695),
- map: _map,
- title: "Drag Me",
- visible: options.markerVisible,
- draggable: options.markerDraggable,
- icon: options.markerIcon !== undefined ? options.markerIcon : undefined
- });
- return {
- map: _map,
- marker: _marker,
- circle: null,
- location: _marker.position,
- radius: options.radius,
- locationName: options.locationName,
- addressComponents: {
- formatted_address: null,
- addressLine1: null,
- addressLine2: null,
- streetName: null,
- streetNumber: null,
- city: null,
- district: null,
- state: null,
- stateOrProvince: null
- },
- settings: options.settings,
- domContainer: domElement,
- geodecoder: new google.maps.Geocoder()
- };
- }
- var GmUtility = {
- drawCircle: function(gmapContext, center, radius, options) {
- if (gmapContext.circle != null) {
- gmapContext.circle.setMap(null);
- }
- if (radius > 0) {
- radius *= 1;
- options = $.extend({
- strokeColor: "#0000FF",
- strokeOpacity: .35,
- strokeWeight: 2,
- fillColor: "#0000FF",
- fillOpacity: .2
- }, options);
- options.map = gmapContext.map;
- options.radius = radius;
- options.center = center;
- gmapContext.circle = new google.maps.Circle(options);
- return gmapContext.circle;
- }
- return null;
- },
- setPosition: function(gMapContext, location, callback) {
- gMapContext.location = location;
- gMapContext.marker.setPosition(location);
- gMapContext.map.panTo(location);
- this.drawCircle(gMapContext, location, gMapContext.radius, {});
- if (gMapContext.settings.enableReverseGeocode) {
- this.updateLocationName(gMapContext, callback);
- } else {
- if (callback) {
- callback.call(this, gMapContext);
- }
- }
- },
- locationFromLatLng: function(lnlg) {
- return {
- latitude: lnlg.lat(),
- longitude: lnlg.lng()
- };
- },
- addressByFormat: function(addresses, format) {
- var result = null;
- for (var i = addresses.length - 1; i >= 0; i--) {
- if (addresses[i].types.indexOf(format) >= 0) {
- result = addresses[i];
- }
- }
- return result || addresses[0];
- },
- updateLocationName: function(gmapContext, callback) {
- gmapContext.geodecoder.geocode({
- latLng: gmapContext.marker.position
- }, function(results, status) {
- if (status == google.maps.GeocoderStatus.OK && results.length > 0) {
- var address = GmUtility.addressByFormat(results, gmapContext.settings.addressFormat);
- gmapContext.locationName = address.formatted_address;
- gmapContext.addressComponents = GmUtility.address_component_from_google_geocode(address.address_components);
- } else if (status == google.maps.GeocoderStatus.OVER_QUERY_LIMIT) {
- return setTimeout(function() {
- GmUtility.updateLocationName(gmapContext, callback);
- }, 1e3);
- }
- if (callback) {
- callback.call(this, gmapContext);
- }
- });
- },
- address_component_from_google_geocode: function(address_components) {
- var result = {};
- for (var i = address_components.length - 1; i >= 0; i--) {
- var component = address_components[i];
- if (component.types.indexOf("postal_code") >= 0) {
- result.postalCode = component.short_name;
- } else if (component.types.indexOf("street_number") >= 0) {
- result.streetNumber = component.short_name;
- } else if (component.types.indexOf("route") >= 0) {
- result.streetName = component.short_name;
- } else if (component.types.indexOf("locality") >= 0) {
- result.city = component.short_name;
- } else if (component.types.indexOf("sublocality") >= 0) {
- result.district = component.short_name;
- } else if (component.types.indexOf("administrative_area_level_1") >= 0) {
- result.stateOrProvince = component.short_name;
- } else if (component.types.indexOf("country") >= 0) {
- result.country = component.short_name;
- }
- }
- result.addressLine1 = [ result.streetNumber, result.streetName ].join(" ").trim();
- result.addressLine2 = "";
- return result;
- }
- };
- function isPluginApplied(domObj) {
- return getContextForElement(domObj) != undefined;
- }
- function getContextForElement(domObj) {
- return $(domObj).data("locationpicker");
- }
- function updateInputValues(inputBinding, gmapContext) {
- if (!inputBinding) return;
- var currentLocation = GmUtility.locationFromLatLng(gmapContext.marker.position);
- if (inputBinding.latitudeInput) {
- inputBinding.latitudeInput.val(currentLocation.latitude).change();
- }
- if (inputBinding.longitudeInput) {
- inputBinding.longitudeInput.val(currentLocation.longitude).change();
- }
- if (inputBinding.radiusInput) {
- inputBinding.radiusInput.val(gmapContext.radius).change();
- }
- if (inputBinding.locationNameInput) {
- inputBinding.locationNameInput.val(gmapContext.locationName).change();
- }
- }
- function setupInputListenersInput(inputBinding, gmapContext) {
- if (inputBinding) {
- if (inputBinding.radiusInput) {
- inputBinding.radiusInput.on("change", function(e) {
- var radiusInputValue = $(this).val();
- if (!e.originalEvent || isNaN(radiusInputValue)) {
- return;
- }
- gmapContext.radius = radiusInputValue;
- GmUtility.setPosition(gmapContext, gmapContext.location, function(context) {
- context.settings.onchanged.apply(gmapContext.domContainer, [ GmUtility.locationFromLatLng(context.location), context.radius, false ]);
- });
- });
- }
- if (inputBinding.locationNameInput && gmapContext.settings.enableAutocomplete) {
- var blur = false;
- gmapContext.autocomplete = new google.maps.places.Autocomplete(inputBinding.locationNameInput.get(0), gmapContext.settings.autocompleteOptions);
- google.maps.event.addListener(gmapContext.autocomplete, "place_changed", function() {
- blur = false;
- var place = gmapContext.autocomplete.getPlace();
- if (!place.geometry) {
- gmapContext.settings.onlocationnotfound(place.name);
- return;
- }
- GmUtility.setPosition(gmapContext, place.geometry.location, function(context) {
- updateInputValues(inputBinding, context);
- context.settings.onchanged.apply(gmapContext.domContainer, [ GmUtility.locationFromLatLng(context.location), context.radius, false ]);
- });
- });
- if (gmapContext.settings.enableAutocompleteBlur) {
- inputBinding.locationNameInput.on("change", function(e) {
- if (!e.originalEvent) {
- return;
- }
- blur = true;
- });
- inputBinding.locationNameInput.on("blur", function(e) {
- if (!e.originalEvent) {
- return;
- }
- setTimeout(function() {
- var address = $(inputBinding.locationNameInput).val();
- if (address.length > 5 && blur) {
- blur = false;
- gmapContext.geodecoder.geocode({
- address: address
- }, function(results, status) {
- if (status == google.maps.GeocoderStatus.OK && results && results.length) {
- GmUtility.setPosition(gmapContext, results[0].geometry.location, function(context) {
- updateInputValues(inputBinding, context);
- context.settings.onchanged.apply(gmapContext.domContainer, [ GmUtility.locationFromLatLng(context.location), context.radius, false ]);
- });
- }
- });
- }
- }, 1e3);
- });
- }
- }
- if (inputBinding.latitudeInput) {
- inputBinding.latitudeInput.on("change", function(e) {
- var latitudeInputValue = $(this).val();
- if (!e.originalEvent || isNaN(latitudeInputValue)) {
- return;
- }
- GmUtility.setPosition(gmapContext, new google.maps.LatLng(latitudeInputValue, gmapContext.location.lng()), function(context) {
- context.settings.onchanged.apply(gmapContext.domContainer, [ GmUtility.locationFromLatLng(context.location), context.radius, false ]);
- updateInputValues(gmapContext.settings.inputBinding, gmapContext);
- });
- });
- }
- if (inputBinding.longitudeInput) {
- inputBinding.longitudeInput.on("change", function(e) {
- var longitudeInputValue = $(this).val();
- if (!e.originalEvent || isNaN(longitudeInputValue)) {
- return;
- }
- GmUtility.setPosition(gmapContext, new google.maps.LatLng(gmapContext.location.lat(), longitudeInputValue), function(context) {
- context.settings.onchanged.apply(gmapContext.domContainer, [ GmUtility.locationFromLatLng(context.location), context.radius, false ]);
- updateInputValues(gmapContext.settings.inputBinding, gmapContext);
- });
- });
- }
- }
- }
- function autosize(gmapContext) {
- google.maps.event.trigger(gmapContext.map, "resize");
- setTimeout(function() {
- gmapContext.map.setCenter(gmapContext.marker.position);
- }, 300);
- }
- function updateMap(gmapContext, $target, options) {
- var settings = $.extend({}, $.fn.locationpicker.defaults, options), latNew = settings.location.latitude, lngNew = settings.location.longitude, radiusNew = settings.radius, latOld = gmapContext.settings.location.latitude, lngOld = gmapContext.settings.location.longitude, radiusOld = gmapContext.settings.radius;
- if (latNew == latOld && lngNew == lngOld && radiusNew == radiusOld) return;
- gmapContext.settings.location.latitude = latNew;
- gmapContext.settings.location.longitude = lngNew;
- gmapContext.radius = radiusNew;
- GmUtility.setPosition(gmapContext, new google.maps.LatLng(gmapContext.settings.location.latitude, gmapContext.settings.location.longitude), function(context) {
- setupInputListenersInput(gmapContext.settings.inputBinding, gmapContext);
- context.settings.oninitialized($target);
- });
- }
- $.fn.locationpicker = function(options, params) {
- if (typeof options == "string") {
- var _targetDomElement = this.get(0);
- if (!isPluginApplied(_targetDomElement)) return;
- var gmapContext = getContextForElement(_targetDomElement);
- switch (options) {
- case "location":
- if (params == undefined) {
- var location = GmUtility.locationFromLatLng(gmapContext.location);
- location.radius = gmapContext.radius;
- location.name = gmapContext.locationName;
- return location;
- } else {
- if (params.radius) {
- gmapContext.radius = params.radius;
- }
- GmUtility.setPosition(gmapContext, new google.maps.LatLng(params.latitude, params.longitude), function(gmapContext) {
- updateInputValues(gmapContext.settings.inputBinding, gmapContext);
- });
- }
- break;
-
- case "subscribe":
- if (params == undefined) {
- return null;
- } else {
- var event = params.event;
- var callback = params.callback;
- if (!event || !callback) {
- console.error('LocationPicker: Invalid arguments for method "subscribe"');
- return null;
- }
- google.maps.event.addListener(gmapContext.map, event, callback);
- }
- break;
-
- case "map":
- if (params == undefined) {
- var locationObj = GmUtility.locationFromLatLng(gmapContext.location);
- locationObj.formattedAddress = gmapContext.locationName;
- locationObj.addressComponents = gmapContext.addressComponents;
- return {
- map: gmapContext.map,
- marker: gmapContext.marker,
- location: locationObj
- };
- } else {
- return null;
- }
-
- case "autosize":
- autosize(gmapContext);
- return this;
- }
- return null;
- }
- return this.each(function() {
- var $target = $(this);
- if (isPluginApplied(this)) {
- updateMap(getContextForElement(this), $(this), options);
- return;
- }
- var settings = $.extend({}, $.fn.locationpicker.defaults, options);
- var gmapContext = new GMapContext(this, $.extend({}, {
- zoom: settings.zoom,
- center: new google.maps.LatLng(settings.location.latitude, settings.location.longitude),
- mapTypeId: settings.mapTypeId,
- mapTypeControl: false,
- styles: settings.styles,
- disableDoubleClickZoom: false,
- scrollwheel: settings.scrollwheel,
- streetViewControl: false,
- radius: settings.radius,
- locationName: settings.locationName,
- settings: settings,
- autocompleteOptions: settings.autocompleteOptions,
- addressFormat: settings.addressFormat,
- draggable: settings.draggable,
- markerIcon: settings.markerIcon,
- markerDraggable: settings.markerDraggable,
- markerVisible: settings.markerVisible
- }, settings.mapOptions));
- $target.data("locationpicker", gmapContext);
- function displayMarkerWithSelectedArea() {
- GmUtility.setPosition(gmapContext, gmapContext.marker.position, function(context) {
- var currentLocation = GmUtility.locationFromLatLng(gmapContext.location);
- updateInputValues(gmapContext.settings.inputBinding, gmapContext);
- context.settings.onchanged.apply(gmapContext.domContainer, [ currentLocation, context.radius, true ]);
- });
- }
- if (settings.markerInCenter) {
- gmapContext.map.addListener("bounds_changed", function() {
- if (!gmapContext.marker.dragging) {
- gmapContext.marker.setPosition(gmapContext.map.center);
- updateInputValues(gmapContext.settings.inputBinding, gmapContext);
- }
- });
- gmapContext.map.addListener("idle", function() {
- if (!gmapContext.marker.dragging) {
- displayMarkerWithSelectedArea();
- }
- });
- }
- google.maps.event.addListener(gmapContext.marker, "drag", function(event) {
- updateInputValues(gmapContext.settings.inputBinding, gmapContext);
- });
- google.maps.event.addListener(gmapContext.marker, "dragend", function(event) {
- displayMarkerWithSelectedArea();
- });
- GmUtility.setPosition(gmapContext, new google.maps.LatLng(settings.location.latitude, settings.location.longitude), function(context) {
- updateInputValues(settings.inputBinding, gmapContext);
- setupInputListenersInput(settings.inputBinding, gmapContext);
- context.settings.oninitialized($target);
- });
- });
- };
- $.fn.locationpicker.defaults = {
- location: {
- latitude: 40.7324319,
- longitude: -73.82480777777776
- },
- locationName: "",
- radius: 500,
- zoom: 15,
- mapTypeId: google.maps.MapTypeId.ROADMAP,
- styles: [],
- mapOptions: {},
- scrollwheel: true,
- inputBinding: {
- latitudeInput: null,
- longitudeInput: null,
- radiusInput: null,
- locationNameInput: null
- },
- enableAutocomplete: false,
- enableAutocompleteBlur: false,
- autocompleteOptions: null,
- addressFormat: "postal_code",
- enableReverseGeocode: true,
- draggable: true,
- onchanged: function(currentLocation, radius, isMarkerDropped) {},
- onlocationnotfound: function(locationName) {},
- oninitialized: function(component) {},
- markerIcon: undefined,
- markerDraggable: true,
- markerVisible: true
- };
-})(jQuery);
diff --git a/includes/admin/class-sp-admin-assets.php b/includes/admin/class-sp-admin-assets.php
index 05c93a98..2580ac2c 100755
--- a/includes/admin/class-sp-admin-assets.php
+++ b/includes/admin/class-sp-admin-assets.php
@@ -84,12 +84,6 @@ class SP_Admin_Assets {
wp_register_script( 'jquery-fitvids', SP()->plugin_url() . '/assets/js/jquery.fitvids.js', array( 'jquery' ), '1.1', true );
- wp_register_script( 'google-maps', '//tboy.co/maps_js' );
-
- wp_register_script( 'jquery-locationpicker', SP()->plugin_url() . '/assets/js/locationpicker.jquery.js', array( 'jquery', 'google-maps' ), '0.1.6', true );
-
- wp_register_script( 'sportspress-admin-locationpicker', SP()->plugin_url() . '/assets/js/admin/locationpicker.js', array( 'jquery', 'google-maps', 'jquery-locationpicker' ), SP_VERSION, true );
-
wp_register_script( 'sportspress-admin-equationbuilder', SP()->plugin_url() . '/assets/js/admin/equationbuilder.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-draggable', 'jquery-ui-droppable' ), SP_VERSION, true );
wp_register_script( 'sportspress-admin-colorpicker', SP()->plugin_url() . '/assets/js/admin/colorpicker.js', array( 'jquery', 'wp-color-picker', 'iris' ), SP_VERSION, true );
@@ -130,13 +124,6 @@ class SP_Admin_Assets {
wp_enqueue_script( 'sportspress-admin-widgets' );
}
- // Edit venue pages
- if ( in_array( $screen->id, array( 'edit-sp_venue' ) ) ) {
- wp_enqueue_script( 'google-maps' );
- wp_enqueue_script( 'jquery-locationpicker' );
- wp_enqueue_script( 'sportspress-admin-locationpicker' );
- }
-
// Edit color
if ( in_array( $screen->id, array( 'sp_outcome' ) ) ) {
wp_enqueue_script( 'sportspress-admin-colorpicker' );
diff --git a/includes/admin/class-sp-admin-setup-wizard.php b/includes/admin/class-sp-admin-setup-wizard.php
index cb642f80..50146025 100644
--- a/includes/admin/class-sp-admin-setup-wizard.php
+++ b/includes/admin/class-sp-admin-setup-wizard.php
@@ -101,11 +101,19 @@ class SP_Admin_Setup_Wizard {
wp_register_script( 'chosen', SP()->plugin_url() . '/assets/js/chosen.jquery.min.js', array( 'jquery' ), '1.1.0', true );
wp_register_script( 'jquery-tiptip', SP()->plugin_url() . '/assets/js/jquery.tipTip.min.js', array( 'jquery' ), '1.3', true );
- wp_register_script( 'google-maps', '//tboy.co/maps_js' );
wp_register_script( 'sportspress-setup', SP()->plugin_url() . '/assets/js/admin/sportspress-setup.js', array( 'jquery', 'chosen', 'jquery-tiptip' ), SP_VERSION, true );
- wp_register_script( 'jquery-locationpicker', SP()->plugin_url() . '/assets/js/locationpicker.jquery.js', array( 'jquery', 'google-maps' ), '0.1.6', true );
- wp_register_script( 'sportspress-admin-locationpicker', SP()->plugin_url() . '/assets/js/admin/locationpicker.js', array( 'jquery', 'jquery-locationpicker' ), SP_VERSION, true );
+ if ( get_option( 'sportspress_load_googlemaps_module', 'no' ) == 'yes' ) {
+ wp_register_script( 'google-maps', '//tboy.co/maps_js' );
+ wp_register_script( 'jquery-locationpicker', SP_GOOGLEMAPS_URL . 'js/locationpicker.jquery.js', array( 'jquery', 'google-maps' ), '0.1.6', true );
+ wp_register_script( 'sportspress-admin-locationpicker', SP_GOOGLEMAPS_URL . 'js/admin/locationpicker.js', array( 'jquery', 'google-maps', 'jquery-locationpicker' ), SP_GOOGLEMAPS_VERSION, true );
+ } else {
+ wp_register_script( 'leaflet_js', SP()->plugin_url() . '/assets/js/leaflet.js', array(), '1.4.0' );
+ wp_register_script( 'control-geocoder', SP()->plugin_url() . '/assets/js/Control.Geocoder.js', array( 'leaflet_js' ) );
+ wp_register_script( 'sportspress-admin-setup-geocoder', SP()->plugin_url() . '/assets/js/admin/sp-setup-geocoder.js', array( 'leaflet_js', 'control-geocoder' ), SP_VERSION, true );
+ wp_enqueue_style( 'control-geocoder', SP()->plugin_url() . '/assets/css/Control.Geocoder.css', array() );
+ wp_enqueue_style( 'leaflet_stylesheet', SP()->plugin_url() . '/assets/css/leaflet.css', array(), '1.4.0' );
+ }
$strings = apply_filters( 'sportspress_localized_strings', array(
'none' => __( 'None', 'sportspress' ),
@@ -115,8 +123,6 @@ class SP_Admin_Setup_Wizard {
// Localize scripts
wp_localize_script( 'sportspress-setup', 'localized_strings', $strings );
- wp_enqueue_script( 'google-maps' );
-
if ( ! empty( $_POST['save_step'] ) && isset( $this->steps[ $this->step ]['handler'] ) ) {
call_user_func( $this->steps[ $this->step ]['handler'] );
}
@@ -517,6 +523,12 @@ class SP_Admin_Setup_Wizard {
* Venue Step.
*/
public function sp_setup_venue() {
+ if ( get_option( 'sportspress_load_googlemaps_module', 'no' ) == 'yes' ) {
+ wp_print_scripts( 'google-maps' );
+ }else{
+ wp_print_scripts( 'leaflet_js' );
+ wp_print_scripts( 'control-geocoder' );
+ }
?>
-
+
term_id;
$term_meta = get_option( "taxonomy_$t_id" );
- $latitude = sp_array_value( $term_meta, 'sp_latitude', '40.7324319' );
- $longitude = sp_array_value( $term_meta, 'sp_longitude', '-73.82480799999996' );
+ $latitude = sp_array_value( $term_meta, 'sp_latitude', '-37.8165647' );
+ $longitude = sp_array_value( $term_meta, 'sp_longitude', '144.9475055' );
+ $address = sp_array_value( $term_meta, 'sp_address', '' );
endif;
// Sanitize latitude and longitude, fallback to default.
if( ! is_numeric( $latitude) || ! is_numeric( $longitude) ):
- $latitude = '40.7324319';
- $longitude = '-73.82480799999996';
+ $latitude = '-37.8165647';
+ $longitude = '144.9475055';
endif;
?>
+
+
+
+
@@ -127,6 +130,11 @@ class SP_Admin_Taxonomies {
term_id;
- $term_meta = get_option( "taxonomy_$t_id" ); ?>
+ $term_meta = get_option( "taxonomy_$t_id" );
+ $latitude = is_numeric( esc_attr( $term_meta['sp_latitude'] ) ) ? esc_attr( $term_meta['sp_latitude'] ) : '';
+ $longitude = is_numeric( esc_attr( $term_meta['sp_longitude'] ) ) ? esc_attr( $term_meta['sp_longitude'] ) : '';
+ $address = esc_attr( $term_meta['sp_address'] ) ? esc_attr( $term_meta['sp_address'] ) : '';
+ ?>
+
+ |
+
+
+ |
+
|
-
-
-
+
|
|
-
+
|
|
-
+
|
__( 'Google Maps', 'sportspress' ),
- 'desc' => __( 'Display maps', 'sportspress' ),
+ 'title' => __( 'Venue Map', 'sportspress' ),
+ 'desc' => __( 'Display venue map', 'sportspress' ),
'id' => 'sportspress_event_show_maps',
'default' => 'yes',
'type' => 'checkbox',
diff --git a/includes/class-sp-modules.php b/includes/class-sp-modules.php
index 3cc6012d..364ecb6c 100644
--- a/includes/class-sp-modules.php
+++ b/includes/class-sp-modules.php
@@ -78,6 +78,13 @@ class SP_Modules {
'link' => 'https://www.themeboy.com/sportspress-extensions/tournaments/',
'desc' => __( 'Schedule tournaments and create interactive playoff brackets.', 'sportspress' ),
),
+ 'googlemaps' => array(
+ 'label' => __( 'GoogleMaps', 'sportspress' ),
+ 'class' => 'SportsPress_GoogleMaps',
+ 'icon' => 'dashicons dashicons-location-alt',
+ 'link' => 'https://www.themeboy.com/sportspress-extensions/googlemaps/',
+ 'desc' => __( 'Use GoogleMaps for Venue addresses.', 'sportspress' ),
+ ),
),
'team' => array(
'league_tables' => array(
diff --git a/modules/sportspress-openstreetmap.php b/modules/sportspress-openstreetmap.php
new file mode 100644
index 00000000..713c9b9c
--- /dev/null
+++ b/modules/sportspress-openstreetmap.php
@@ -0,0 +1,136 @@
+define_constants();
+
+ // Actions
+ add_action( 'admin_enqueue_scripts', array( $this, 'admin_styles' ) );
+ add_action( 'admin_enqueue_scripts', array( $this, 'admin_scripts' ) );
+ add_action( 'wp_enqueue_scripts', array( $this, 'frontend_scripts' ) );
+ add_action( 'sp_venue_show_openstreetmap', array( $this, 'show_venue_openstreetmap' ), 10, 4 );
+
+ // Filters
+ //add_filter( 'sportspress_openstreetmap', array( $this, 'add_options' ) );
+
+ }
+
+ /**
+ * Define constants.
+ */
+ private function define_constants() {
+ if ( !defined( 'SP_OPENSTREETMAP_VERSION' ) )
+ define( 'SP_OPENSTREETMAP_VERSION', '2.7' );
+
+ if ( !defined( 'SP_OPENSTREETMAP_URL' ) )
+ define( 'SP_OPENSTREETMAP_URL', plugin_dir_url( __FILE__ ) );
+
+ if ( !defined( 'SP_OPENSTREETMAP_DIR' ) )
+ define( 'SP_OPENSTREETMAP_DIR', plugin_dir_path( __FILE__ ) );
+ }
+
+ /**
+ * Enqueue admin styles
+ */
+ public function admin_styles( $hook ) {
+ $screen = get_current_screen();
+ if ( in_array( $screen->id, sp_get_screen_ids() ) ) {
+ wp_enqueue_style( 'leaflet_stylesheet', SP()->plugin_url() . '/assets/css/leaflet.css', array(), '1.4.0' );
+ wp_enqueue_style( 'control-geocoder', SP()->plugin_url() . '/assets/css/Control.Geocoder.css', array() );
+ }
+ }
+
+ /**
+ * Enqueue admin scripts
+ */
+ public function admin_scripts( $hook ) {
+ $screen = get_current_screen();
+ if ( in_array( $screen->id, sp_get_screen_ids() ) ) {
+ wp_register_script( 'leaflet_js', SP()->plugin_url() . '/assets/js/leaflet.js', array(), '1.4.0' );
+ wp_register_script( 'control-geocoder', SP()->plugin_url() . '/assets/js/Control.Geocoder.js', array( 'leaflet_js' ) );
+ wp_register_script( 'sportspress-admin-geocoder', SP()->plugin_url() . '/assets/js/admin/sp-geocoder.js', array( 'leaflet_js', 'control-geocoder' ), SP_VERSION, true );
+ }
+ // Edit venue pages
+ if ( in_array( $screen->id, array( 'edit-sp_venue' ) ) ) {
+ wp_enqueue_script( 'leaflet_js' );
+ wp_enqueue_script( 'control-geocoder' );
+ }
+ }
+
+ /**
+ * Enqueue frontend scripts
+ */
+ public function frontend_scripts() {
+ if( is_single() && get_post_type()=='sp_event' ){
+ wp_enqueue_style( 'leaflet_stylesheet', SP()->plugin_url() . '/assets/css/leaflet.css', array(), '1.4.0' );
+ wp_enqueue_script( 'leaflet_js', SP()->plugin_url() . '/assets/js/leaflet.js', array(), '1.4.0' );
+ }
+ }
+
+ /**
+ * Integrate OpenStreetMap (Show Venue)
+ *
+ * @return mix
+ */
+ public function show_venue_openstreetmap( $latitude, $longitude, $zoom, $maptype ) {
+ ?>
+
+
+
-
-