angular-baidu-map
Advanced tools
Comparing version 2.1.0 to 2.2.0
@@ -14,10 +14,10 @@ (function webpackUniversalModuleDefinition(root, factory) { | ||
/******/ var installedModules = {}; | ||
/******/ | ||
/******/ // The require function | ||
/******/ function __webpack_require__(moduleId) { | ||
/******/ | ||
/******/ // Check if module is in cache | ||
/******/ if(installedModules[moduleId]) | ||
/******/ return installedModules[moduleId].exports; | ||
/******/ | ||
/******/ // Create a new module (and put it into the cache) | ||
@@ -29,23 +29,23 @@ /******/ var module = installedModules[moduleId] = { | ||
/******/ }; | ||
/******/ | ||
/******/ // Execute the module function | ||
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); | ||
/******/ | ||
/******/ // Flag the module as loaded | ||
/******/ module.loaded = true; | ||
/******/ | ||
/******/ // Return the exports of the module | ||
/******/ return module.exports; | ||
/******/ } | ||
/******/ | ||
/******/ | ||
/******/ // expose the modules object (__webpack_modules__) | ||
/******/ __webpack_require__.m = modules; | ||
/******/ | ||
/******/ // expose the module cache | ||
/******/ __webpack_require__.c = installedModules; | ||
/******/ | ||
/******/ // __webpack_public_path__ | ||
/******/ __webpack_require__.p = ""; | ||
/******/ | ||
/******/ // Load entry module and return exports | ||
@@ -60,3 +60,3 @@ /******/ return __webpack_require__(0); | ||
'use strict'; | ||
Object.defineProperty(exports, "__esModule", { | ||
@@ -66,24 +66,24 @@ value: true | ||
exports.ngBaiduMap = undefined; | ||
var _angular = __webpack_require__(1); | ||
var _angular2 = _interopRequireDefault(_angular); | ||
var _defaults = __webpack_require__(2); | ||
var _validator = __webpack_require__(3); | ||
var _directiveDef = __webpack_require__(4); | ||
var _baiduScriptLoader = __webpack_require__(5); | ||
var _offline = __webpack_require__(6); | ||
var _map = __webpack_require__(7); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } | ||
var ngBaiduMap = exports.ngBaiduMap = function () { | ||
var name = 'baiduMap'; | ||
(0, _directiveDef.def)(name, { | ||
@@ -98,3 +98,3 @@ restrict: 'E', | ||
link: function link($scope, element, attrs) { | ||
var opts = _angular2.default.extend({}, _defaults.defaultOpts, $scope.options); | ||
@@ -108,16 +108,16 @@ var offlineOpts = _angular2.default.extend({}, _defaults.defaultOfflineOpts, $scope.offline); | ||
(0, _validator.validator)(opts.city, 'options.city must be set'); | ||
(0, _baiduScriptLoader.loader)($scope.ak, offlineOpts, function () { | ||
var map = (0, _map.createInstance)(opts, element); | ||
$scope.onMapLoaded({ map: map }); | ||
//create markers | ||
var previousMarkers = []; | ||
(0, _map.redrawMarkers)(map, previousMarkers, opts); | ||
$scope.$watch('options.center', function (newValue, oldValue) { | ||
opts = $scope.options; | ||
@@ -127,3 +127,3 @@ map.centerAndZoom(new BMap.Point(opts.center.longitude, opts.center.latitude), opts.zoom); | ||
}, true); | ||
$scope.$watch('options.markers', function (newValue, oldValue) { | ||
@@ -133,6 +133,6 @@ (0, _map.redrawMarkers)(map, previousMarkers, opts); | ||
}); | ||
$scope.divStyle = _offline.divStyle; | ||
$scope.labelStyle = _offline.labelStyle; | ||
setTimeout(function () { | ||
@@ -147,3 +147,3 @@ var $label = document.querySelector('baidu-map div label'); | ||
}); | ||
return name; | ||
@@ -163,3 +163,3 @@ }(); | ||
'use strict'; | ||
Object.defineProperty(exports, "__esModule", { | ||
@@ -175,3 +175,3 @@ value: true | ||
}; | ||
var defaultOfflineOpts = exports.defaultOfflineOpts = { | ||
@@ -187,3 +187,3 @@ retryInterval: 30000, | ||
"use strict"; | ||
Object.defineProperty(exports, "__esModule", { | ||
@@ -203,3 +203,3 @@ value: true | ||
'use strict'; | ||
Object.defineProperty(exports, "__esModule", { | ||
@@ -209,9 +209,9 @@ value: true | ||
exports.def = undefined; | ||
var _angular = __webpack_require__(1); | ||
var _angular2 = _interopRequireDefault(_angular); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } | ||
var def = exports.def = function def(name, ddo) { | ||
@@ -228,3 +228,3 @@ _angular2.default.module(name, []).directive(name, [function () { | ||
'use strict'; | ||
Object.defineProperty(exports, "__esModule", { | ||
@@ -234,4 +234,4 @@ value: true | ||
var loader = exports.loader = function loader(ak, offlineOpts, callback) { | ||
var MAP_URL = 'http://api.map.baidu.com/api?v=2.0&ak=' + ak + '&callback=baidumapinit'; | ||
var MAP_URL = '//api.map.baidu.com/api?v=2.0&ak=' + ak + '&callback=baidumapinit&s=' + (location.protocol === 'https:' ? 1 : 0); | ||
var baiduMap = window.baiduMap; | ||
@@ -241,7 +241,7 @@ if (baiduMap && baiduMap.status === 'loading') { | ||
} | ||
if (baiduMap && baiduMap.status === 'loaded') { | ||
return callback(); | ||
} | ||
window.baiduMap = { status: 'loading', callbacks: [] }; | ||
@@ -256,3 +256,3 @@ window.baidumapinit = function () { | ||
}; | ||
var createTag = function createTag() { | ||
@@ -263,3 +263,3 @@ var script = document.createElement('script'); | ||
script.onerror = function () { | ||
Array.prototype.slice.call(document.querySelectorAll('baidu-map div')).forEach(function (node) { | ||
@@ -273,3 +273,3 @@ node.style.opacity = 1; | ||
}; | ||
createTag(); | ||
@@ -283,3 +283,3 @@ }; | ||
'use strict'; | ||
Object.defineProperty(exports, "__esModule", { | ||
@@ -295,3 +295,3 @@ value: true | ||
}; | ||
var labelStyle = exports.labelStyle = { | ||
@@ -311,3 +311,3 @@ fontSize: '30px', | ||
'use strict'; | ||
Object.defineProperty(exports, "__esModule", { | ||
@@ -319,3 +319,3 @@ value: true | ||
var map = new BMap.Map(element[0]); | ||
// init map, set central location and zoom level | ||
@@ -339,3 +339,3 @@ map.centerAndZoom(new BMap.Point(opts.center.longitude, opts.center.latitude), opts.zoom); | ||
} | ||
// set the city name | ||
@@ -345,3 +345,3 @@ map.setCurrentCity(opts.city); | ||
}; | ||
var createMarker = exports.createMarker = function createMarker(marker, pt) { | ||
@@ -354,23 +354,23 @@ if (marker.icon) { | ||
}; | ||
var redrawMarkers = exports.redrawMarkers = function redrawMarkers(map, previousMarkers, opts) { | ||
previousMarkers.forEach(function (_ref) { | ||
var marker = _ref.marker; | ||
var listener = _ref.listener; | ||
marker.removeEventListener('click', listener); | ||
map.removeOverlay(marker); | ||
}); | ||
previousMarkers.length = 0; | ||
if (!opts.markers) { | ||
return; | ||
} | ||
opts.markers.forEach(function (marker) { | ||
var marker2 = createMarker(marker, new BMap.Point(marker.longitude, marker.latitude)); | ||
// add marker to the map | ||
@@ -380,3 +380,3 @@ map.addOverlay(marker2); | ||
previousMarkers.push(previousMarker); | ||
if (!marker.title && !marker.content) { | ||
@@ -383,0 +383,0 @@ return; |
@@ -1,1 +0,1 @@ | ||
!function(e,t){if("object"==typeof exports&&"object"==typeof module)module.exports=t(require("angular"));else if("function"==typeof define&&define.amd)define(["angular"],t);else{var n=t("object"==typeof exports?require("angular"):e.angular);for(var o in n)("object"==typeof exports?exports:e)[o]=n[o]}}(this,function(e){return function(e){function t(o){if(n[o])return n[o].exports;var r=n[o]={exports:{},id:o,loaded:!1};return e[o].call(r.exports,r,r.exports,t),r.loaded=!0,r.exports}var n={};return t.m=e,t.c=n,t.p="",t(0)}([function(e,t,n){"use strict";function o(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(t,"__esModule",{value:!0}),t.ngBaiduMap=void 0;var r=n(1),a=o(r),i=n(2),l=n(3),u=n(4),d=n(5),c=n(6),s=n(7);t.ngBaiduMap=function(){var e="baiduMap";return(0,u.def)(e,{restrict:"E",scope:{options:"=",ak:"@",offline:"=",onMapLoaded:"&"},link:function(e,t,n){var o=a["default"].extend({},i.defaultOpts,e.options),r=a["default"].extend({},i.defaultOfflineOpts,e.offline);e.offlineWords=r.txt,(0,l.validator)(e.ak,"ak must not be empty"),(0,l.validator)(o.center,"options.center must be set"),(0,l.validator)(o.center.longitude,"options.center.longitude must be set"),(0,l.validator)(o.center.latitude,"options.center.latitude must be set"),(0,l.validator)(o.city,"options.city must be set"),(0,d.loader)(e.ak,r,function(){var n=(0,s.createInstance)(o,t);e.onMapLoaded({map:n});var r=[];(0,s.redrawMarkers)(n,r,o),e.$watch("options.center",function(t,a){o=e.options,n.centerAndZoom(new BMap.Point(o.center.longitude,o.center.latitude),o.zoom),(0,s.redrawMarkers)(n,r,o)},!0),e.$watch("options.markers",function(e,t){(0,s.redrawMarkers)(n,r,o)},!0)}),e.divStyle=c.divStyle,e.labelStyle=c.labelStyle,setTimeout(function(){var t=document.querySelector("baidu-map div label");e.labelStyle.marginTop=t.clientHeight/-2+"px",e.labelStyle.marginLeft=t.clientWidth/-2+"px",e.$apply()})},template:'<div ng-style="divStyle"><label ng-style="labelStyle">{{ offlineWords }}</label></div>'}),e}()},function(t,n){t.exports=e},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0});t.defaultOpts={navCtrl:!0,scaleCtrl:!0,overviewCtrl:!0,enableScrollWheelZoom:!0,zoom:10},t.defaultOfflineOpts={retryInterval:3e4,txt:"OFFLINE"}},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0});t.validator=function(e,t){if(!e)throw new Error(t)}},function(e,t,n){"use strict";function o(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(t,"__esModule",{value:!0}),t.def=void 0;var r=n(1),a=o(r);t.def=function(e,t){a["default"].module(e,[]).directive(e,[function(){return t}])}},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0});t.loader=function(e,t,n){var o="http://api.map.baidu.com/api?v=2.0&ak="+e+"&callback=baidumapinit",r=window.baiduMap;if(r&&"loading"===r.status)return r.callbacks.push(n);if(r&&"loaded"===r.status)return n();window.baiduMap={status:"loading",callbacks:[]},window.baidumapinit=function(){window.baiduMap.status="loaded",n(),window.baiduMap.callbacks.forEach(function(e){return e()}),window.baiduMap.callbacks=[]};var a=function i(){var e=document.createElement("script");e.type="text/javascript",e.src=o,e.onerror=function(){Array.prototype.slice.call(document.querySelectorAll("baidu-map div")).forEach(function(e){e.style.opacity=1}),document.body.removeChild(e),setTimeout(i,t.retryInterval)},document.body.appendChild(e)};a()}},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0});t.divStyle={width:"100%",height:"100%",backgroundColor:"#E6E6E6",position:"relative",opacity:0},t.labelStyle={fontSize:"30px",position:"absolute",top:"50%",marginTop:0,left:"50%",marginLeft:0}},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=(t.createInstance=function(e,t){var n=new BMap.Map(t[0]);return n.centerAndZoom(new BMap.Point(e.center.longitude,e.center.latitude),e.zoom),e.navCtrl&&n.addControl(new BMap.NavigationControl),e.scaleCtrl&&n.addControl(new BMap.ScaleControl),e.overviewCtrl&&n.addControl(new BMap.OverviewMapControl),e.enableScrollWheelZoom&&n.enableScrollWheelZoom(),n.setCurrentCity(e.city),n},t.createMarker=function(e,t){if(e.icon){var n=new BMap.Icon(e.icon,new BMap.Size(e.width,e.height));return new BMap.Marker(t,{icon:n})}return new BMap.Marker(t)});t.redrawMarkers=function(e,t,o){t.forEach(function(t){var n=t.marker,o=t.listener;n.removeEventListener("click",o),e.removeOverlay(n)}),t.length=0,o.markers&&o.markers.forEach(function(o){var r=n(o,new BMap.Point(o.longitude,o.latitude));e.addOverlay(r);var a={marker:r,listener:null};if(t.push(a),o.title||o.content){var i="<p>"+(o.title||"")+"</p><p>"+(o.content||"")+"</p>",l=new BMap.InfoWindow(i,{enableMessage:!!o.enableMessage});a.listener=function(){this.openInfoWindow(l)},r.addEventListener("click",a.listener)}})}}])}); | ||
!function(e,t){if("object"==typeof exports&&"object"==typeof module)module.exports=t(require("angular"));else if("function"==typeof define&&define.amd)define(["angular"],t);else{var n=t("object"==typeof exports?require("angular"):e.angular);for(var o in n)("object"==typeof exports?exports:e)[o]=n[o]}}(this,function(e){return function(e){function t(o){if(n[o])return n[o].exports;var r=n[o]={exports:{},id:o,loaded:!1};return e[o].call(r.exports,r,r.exports,t),r.loaded=!0,r.exports}var n={};return t.m=e,t.c=n,t.p="",t(0)}([function(e,t,n){"use strict";function o(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(t,"__esModule",{value:!0}),t.ngBaiduMap=void 0;var r=n(1),a=o(r),i=n(2),l=n(3),u=n(4),d=n(5),c=n(6),s=n(7);t.ngBaiduMap=function(){var e="baiduMap";return(0,u.def)(e,{restrict:"E",scope:{options:"=",ak:"@",offline:"=",onMapLoaded:"&"},link:function(e,t,n){var o=a["default"].extend({},i.defaultOpts,e.options),r=a["default"].extend({},i.defaultOfflineOpts,e.offline);e.offlineWords=r.txt,(0,l.validator)(e.ak,"ak must not be empty"),(0,l.validator)(o.center,"options.center must be set"),(0,l.validator)(o.center.longitude,"options.center.longitude must be set"),(0,l.validator)(o.center.latitude,"options.center.latitude must be set"),(0,l.validator)(o.city,"options.city must be set"),(0,d.loader)(e.ak,r,function(){var n=(0,s.createInstance)(o,t);e.onMapLoaded({map:n});var r=[];(0,s.redrawMarkers)(n,r,o),e.$watch("options.center",function(t,a){o=e.options,n.centerAndZoom(new BMap.Point(o.center.longitude,o.center.latitude),o.zoom),(0,s.redrawMarkers)(n,r,o)},!0),e.$watch("options.markers",function(e,t){(0,s.redrawMarkers)(n,r,o)},!0)}),e.divStyle=c.divStyle,e.labelStyle=c.labelStyle,setTimeout(function(){var t=document.querySelector("baidu-map div label");e.labelStyle.marginTop=t.clientHeight/-2+"px",e.labelStyle.marginLeft=t.clientWidth/-2+"px",e.$apply()})},template:'<div ng-style="divStyle"><label ng-style="labelStyle">{{ offlineWords }}</label></div>'}),e}()},function(t,n){t.exports=e},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0});t.defaultOpts={navCtrl:!0,scaleCtrl:!0,overviewCtrl:!0,enableScrollWheelZoom:!0,zoom:10},t.defaultOfflineOpts={retryInterval:3e4,txt:"OFFLINE"}},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0});t.validator=function(e,t){if(!e)throw new Error(t)}},function(e,t,n){"use strict";function o(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(t,"__esModule",{value:!0}),t.def=void 0;var r=n(1),a=o(r);t.def=function(e,t){a["default"].module(e,[]).directive(e,[function(){return t}])}},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0});t.loader=function(e,t,n){var o="//api.map.baidu.com/api?v=2.0&ak="+e+"&callback=baidumapinit&s="+("https:"===location.protocol?1:0),r=window.baiduMap;if(r&&"loading"===r.status)return r.callbacks.push(n);if(r&&"loaded"===r.status)return n();window.baiduMap={status:"loading",callbacks:[]},window.baidumapinit=function(){window.baiduMap.status="loaded",n(),window.baiduMap.callbacks.forEach(function(e){return e()}),window.baiduMap.callbacks=[]};var a=function i(){var e=document.createElement("script");e.type="text/javascript",e.src=o,e.onerror=function(){Array.prototype.slice.call(document.querySelectorAll("baidu-map div")).forEach(function(e){e.style.opacity=1}),document.body.removeChild(e),setTimeout(i,t.retryInterval)},document.body.appendChild(e)};a()}},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0});t.divStyle={width:"100%",height:"100%",backgroundColor:"#E6E6E6",position:"relative",opacity:0},t.labelStyle={fontSize:"30px",position:"absolute",top:"50%",marginTop:0,left:"50%",marginLeft:0}},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=(t.createInstance=function(e,t){var n=new BMap.Map(t[0]);return n.centerAndZoom(new BMap.Point(e.center.longitude,e.center.latitude),e.zoom),e.navCtrl&&n.addControl(new BMap.NavigationControl),e.scaleCtrl&&n.addControl(new BMap.ScaleControl),e.overviewCtrl&&n.addControl(new BMap.OverviewMapControl),e.enableScrollWheelZoom&&n.enableScrollWheelZoom(),n.setCurrentCity(e.city),n},t.createMarker=function(e,t){if(e.icon){var n=new BMap.Icon(e.icon,new BMap.Size(e.width,e.height));return new BMap.Marker(t,{icon:n})}return new BMap.Marker(t)});t.redrawMarkers=function(e,t,o){t.forEach(function(t){var n=t.marker,o=t.listener;n.removeEventListener("click",o),e.removeOverlay(n)}),t.length=0,o.markers&&o.markers.forEach(function(o){var r=n(o,new BMap.Point(o.longitude,o.latitude));e.addOverlay(r);var a={marker:r,listener:null};if(t.push(a),o.title||o.content){var i="<p>"+(o.title||"")+"</p><p>"+(o.content||"")+"</p>",l=new BMap.InfoWindow(i,{enableMessage:!!o.enableMessage});a.listener=function(){this.openInfoWindow(l)},r.addEventListener("click",a.listener)}})}}])}); |
{ | ||
"name": "angular-baidu-map", | ||
"version": "2.1.0", | ||
"version": "2.2.0", | ||
"description": "A baidu-map directive for AngularJS", | ||
@@ -38,10 +38,10 @@ "main": "dist/angular-baidu-map.js", | ||
"devDependencies": { | ||
"angular": "^1.5.5", | ||
"babel-core": "^6.8.0", | ||
"babel-loader": "^6.2.4", | ||
"babel-preset-es2015": "^6.6.0", | ||
"lite-server": "^2.2.0", | ||
"unminified-webpack-plugin": "^1.0.0", | ||
"webpack": "^1.13.0" | ||
"angular": "^1.5.7", | ||
"babel-core": "^6.14.0", | ||
"babel-loader": "^6.2.5", | ||
"babel-preset-es2015": "^6.14.0", | ||
"lite-server": "^2.2.2", | ||
"unminified-webpack-plugin": "^1.1.0", | ||
"webpack": "^1.13.2" | ||
} | ||
} |
export const loader = function(ak, offlineOpts, callback) { | ||
var MAP_URL = `http://api.map.baidu.com/api?v=2.0&ak=${ak}&callback=baidumapinit`; | ||
var MAP_URL = `//api.map.baidu.com/api?v=2.0&ak=${ak}&callback=baidumapinit&s=${location.protocol === 'https:' ? 1 : 0}`; | ||
@@ -5,0 +5,0 @@ var baiduMap = window.baiduMap; |
25757
487