Skip to content

Commit bca4577

Browse files
songyumengsongyumeng
committed
fix openlayers 里程定点等bug
1 parent a1d784e commit bca4577

File tree

6 files changed

+53
-115
lines changed

6 files changed

+53
-115
lines changed

‎dist/iclient9-leaflet.js‎

Lines changed: 2 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -21895,7 +21895,7 @@ var SpatialAnalystService = exports.SpatialAnalystService = _ServiceBase.Service
2189521895
for (var i = 0; i < params.inputPoints.length; i++) {
2189621896
var inputPoint = params.inputPoints[i];
2189721897
if (_leaflet2.default.Util.isArray(inputPoint)) {
21898-
params.inputPoints[i] = { x: inputPoint[0], y: inputPoint[1] };
21898+
params.inputPoints[i] = { x: inputPoint[0], y: inputPoint[1], tag: inputPoint[2] };
2189921899
}
2190021900
}
2190121901
}
@@ -64577,105 +64577,7 @@ var names = ["Van_der_Grinten_I", "VanDerGrinten", "vandg"];
6457764577
/* 397 */
6457864578
/***/ (function(module, exports) {
6457964579

64580-
module.exports = {
64581-
"_from": "proj4@2.4.3",
64582-
"_id": "proj4@2.4.3",
64583-
"_inBundle": false,
64584-
"_integrity": "sha1-87t+Yxv/wEfDaho8wUUzoDu+mWk=",
64585-
"_location": "/proj4",
64586-
"_phantomChildren": {},
64587-
"_requested": {
64588-
"type": "version",
64589-
"registry": true,
64590-
"raw": "proj4@2.4.3",
64591-
"name": "proj4",
64592-
"escapedName": "proj4",
64593-
"rawSpec": "2.4.3",
64594-
"saveSpec": null,
64595-
"fetchSpec": "2.4.3"
64596-
},
64597-
"_requiredBy": [
64598-
"/"
64599-
],
64600-
"_resolved": "https://registry.npmjs.org/proj4/-/proj4-2.4.3.tgz",
64601-
"_shasum": "f3bb7e631bffc047c36a1a3cc14533a03bbe9969",
64602-
"_spec": "proj4@2.4.3",
64603-
"_where": "G:\\iClient9",
64604-
"author": "",
64605-
"bugs": {
64606-
"url": "https://github.com/proj4js/proj4js/issues"
64607-
},
64608-
"bundleDependencies": false,
64609-
"contributors": [
64610-
{
64611-
"name": "Mike Adair",
64612-
"email": "madair@dmsolutions.ca"
64613-
},
64614-
{
64615-
"name": "Richard Greenwood",
64616-
"email": "rich@greenwoodmap.com"
64617-
},
64618-
{
64619-
"name": "Calvin Metcalf",
64620-
"email": "calvin.metcalf@gmail.com"
64621-
},
64622-
{
64623-
"name": "Richard Marsden",
64624-
"url": "http://www.winwaed.com"
64625-
},
64626-
{
64627-
"name": "T. Mittan"
64628-
},
64629-
{
64630-
"name": "D. Steinwand"
64631-
},
64632-
{
64633-
"name": "S. Nelson"
64634-
}
64635-
],
64636-
"dependencies": {
64637-
"mgrs": "1.0.0",
64638-
"wkt-parser": "^1.1.3"
64639-
},
64640-
"deprecated": false,
64641-
"description": "Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.",
64642-
"devDependencies": {
64643-
"chai": "~1.8.1",
64644-
"curl": "git://github.com/cujojs/curl.git",
64645-
"grunt": "~0.4.2",
64646-
"grunt-cli": "~0.1.13",
64647-
"grunt-contrib-connect": "~0.6.0",
64648-
"grunt-contrib-jshint": "~1.1.0",
64649-
"grunt-contrib-uglify": "~0.11.1",
64650-
"grunt-mocha-phantomjs": "~0.4.0",
64651-
"grunt-rollup": "^1.0.1",
64652-
"istanbul": "~0.2.4",
64653-
"mocha": "~1.17.1",
64654-
"rollup": "^0.41.4",
64655-
"rollup-plugin-json": "^2.0.1",
64656-
"rollup-plugin-node-resolve": "^2.0.0",
64657-
"tin": "~0.4.0"
64658-
},
64659-
"directories": {
64660-
"test": "test",
64661-
"doc": "docs"
64662-
},
64663-
"homepage": "https://github.com/proj4js/proj4js#readme",
64664-
"license": "MIT",
64665-
"main": "dist/proj4-src.js",
64666-
"module": "lib/index.js",
64667-
"name": "proj4",
64668-
"repository": {
64669-
"type": "git",
64670-
"url": "git://github.com/proj4js/proj4js.git"
64671-
},
64672-
"scripts": {
64673-
"build": "grunt",
64674-
"build:tmerc": "grunt build:tmerc",
64675-
"test": "npm run build && istanbul test _mocha test/test.js"
64676-
},
64677-
"version": "2.4.3"
64678-
};
64580+
module.exports = {"_args":[[{"raw":"proj4@2.4.3","scope":null,"escapedName":"proj4","name":"proj4","rawSpec":"2.4.3","spec":"2.4.3","type":"version"},"E:\\git\\iClient9"]],"_from":"proj4@2.4.3","_id":"proj4@2.4.3","_inCache":true,"_location":"/proj4","_nodeVersion":"6.9.2","_npmOperationalInternal":{"host":"packages-18-east.internal.npmjs.com","tmp":"tmp/proj4-2.4.3.tgz_1488570790416_0.3068596587982029"},"_npmUser":{"name":"cwmma","email":"calvin.metcalf@gmail.com"},"_npmVersion":"4.0.5","_phantomChildren":{},"_requested":{"raw":"proj4@2.4.3","scope":null,"escapedName":"proj4","name":"proj4","rawSpec":"2.4.3","spec":"2.4.3","type":"version"},"_requiredBy":["/"],"_resolved":"https://registry.npmjs.org/proj4/-/proj4-2.4.3.tgz","_shasum":"f3bb7e631bffc047c36a1a3cc14533a03bbe9969","_shrinkwrap":null,"_spec":"proj4@2.4.3","_where":"E:\\git\\iClient9","author":"","bugs":{"url":"https://github.com/proj4js/proj4js/issues"},"contributors":[{"name":"Mike Adair","email":"madair@dmsolutions.ca"},{"name":"Richard Greenwood","email":"rich@greenwoodmap.com"},{"name":"Calvin Metcalf","email":"calvin.metcalf@gmail.com"},{"name":"Richard Marsden","url":"http://www.winwaed.com"},{"name":"T. Mittan"},{"name":"D. Steinwand"},{"name":"S. Nelson"}],"dependencies":{"mgrs":"1.0.0","wkt-parser":"^1.1.3"},"description":"Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.","devDependencies":{"chai":"~1.8.1","curl":"git://github.com/cujojs/curl.git","grunt":"~0.4.2","grunt-cli":"~0.1.13","grunt-contrib-connect":"~0.6.0","grunt-contrib-jshint":"~1.1.0","grunt-contrib-uglify":"~0.11.1","grunt-mocha-phantomjs":"~0.4.0","grunt-rollup":"^1.0.1","istanbul":"~0.2.4","mocha":"~1.17.1","rollup":"^0.41.4","rollup-plugin-json":"^2.0.1","rollup-plugin-node-resolve":"^2.0.0","tin":"~0.4.0"},"directories":{"test":"test","doc":"docs"},"dist":{"shasum":"f3bb7e631bffc047c36a1a3cc14533a03bbe9969","tarball":"https://registry.npmjs.org/proj4/-/proj4-2.4.3.tgz"},"gitHead":"e975a5462ad7abb23e33ea75281eb749e77e1510","homepage":"https://github.com/proj4js/proj4js#readme","license":"MIT","main":"dist/proj4-src.js","maintainers":[{"name":"cwmma","email":"calvin.metcalf@gmail.com"},{"name":"ahocevar","email":"andreas.hocevar@gmail.com"}],"module":"lib/index.js","name":"proj4","optionalDependencies":{},"readme":"ERROR: No README data found!","repository":{"type":"git","url":"git://github.com/proj4js/proj4js.git"},"scripts":{"build":"grunt","build:tmerc":"grunt build:tmerc","test":"npm run build && istanbul test _mocha test/test.js"},"version":"2.4.3"}
6467964581

6468064582
/***/ }),
6468164583
/* 398 */

‎dist/iclient9-leaflet.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/iclient9-openlayers.js‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17886,11 +17886,12 @@ var SpatialAnalystService = function (_ServiceBase) {
1788617886
}
1788717887
if (params.inputPoints) {
1788817888
for (var i = 0; i < params.inputPoints.length; i++) {
17889-
var inputPoint = params.points[i];
17889+
var inputPoint = params.inputPoints[i];
1789017890
if (_Util2.default.isArray(inputPoint)) {
17891-
inputPoint.setCoordinates(inputPoint);
17891+
params.inputPoints[i] = { x: inputPoint[0], y: inputPoint[1], tag: inputPoint[2] };
17892+
} else {
17893+
params.inputPoints[i] = { x: inputPoint.getCoordinates()[0], y: inputPoint.getCoordinates()[1], tag: inputPoint.tag };
1789217894
}
17893-
params.inputPoints[i] = new _SuperMap2.default.Geometry.Point(inputPoint.getCoordinates()[0], inputPoint.getCoordinates()[1]);
1789417895
}
1789517896
}
1789617897
if (params.points) {
@@ -17902,7 +17903,13 @@ var SpatialAnalystService = function (_ServiceBase) {
1790217903
params.points[i] = new _SuperMap2.default.Geometry.Point(point.getCoordinates()[0], point.getCoordinates()[1]);
1790317904
}
1790417905
}
17905-
17906+
if (params.point) {
17907+
var point = params.point;
17908+
if (_Util2.default.isArray(point)) {
17909+
point.setCoordinates(point);
17910+
}
17911+
params.point = new _SuperMap2.default.Geometry.Point(point.getCoordinates()[0], point.getCoordinates()[1]);
17912+
}
1790617913
if (params.extractRegion) {
1790717914
params.extractRegion = this.convertGeometry(params.extractRegion);
1790817915
}
@@ -17912,8 +17919,18 @@ var SpatialAnalystService = function (_ServiceBase) {
1791217919
if (params.sourceGeometry) {
1791317920
params.sourceGeometry = this.convertGeometry(params.sourceGeometry);
1791417921
}
17915-
if (params.sourceRoute && params.sourceRoute.points) {
17916-
params.sourceRoute.points = this.convertGeometry(params.sourceRoute.points);
17922+
if (params.sourceRoute) {
17923+
if (params.sourceRoute instanceof _olDebug2.default.geom.LineString && params.sourceRoute.getCoordinates()) {
17924+
var target = {};
17925+
target.type = "LINEM";
17926+
target.parts = [params.sourceRoute.getCoordinates()[0].length];
17927+
target.points = [];
17928+
for (var i = 0; i < params.sourceRoute.getCoordinates()[0].length; i++) {
17929+
var point = params.sourceRoute.getCoordinates()[0][i];
17930+
target.points = target.points.concat({ x: point[0], y: point[1], measure: point[2] });
17931+
}
17932+
params.sourceRoute = target;
17933+
}
1791717934
}
1791817935
if (params.operateRegions && _Util2.default.isArray(params.operateRegions)) {
1791917936
var me = this;

‎dist/iclient9-openlayers.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/leaflet/services/SpatialAnalystService.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ export var SpatialAnalystService = ServiceBase.extend({
338338
for (var i = 0; i < params.inputPoints.length; i++) {
339339
var inputPoint = params.inputPoints[i];
340340
if (L.Util.isArray(inputPoint)) {
341-
params.inputPoints[i] = {x: inputPoint[0], y: inputPoint[1]};
341+
params.inputPoints[i] = {x: inputPoint[0], y: inputPoint[1],tag:inputPoint[2]};
342342
}
343343
}
344344
}

‎src/openlayers/services/SpatialAnalystService.js‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -347,11 +347,13 @@ export default class SpatialAnalystService extends ServiceBase {
347347
}
348348
if (params.inputPoints) {
349349
for (var i = 0; i < params.inputPoints.length; i++) {
350-
var inputPoint = params.points[i];
350+
var inputPoint = params.inputPoints[i];
351351
if (Util.isArray(inputPoint)) {
352-
inputPoint.setCoordinates(inputPoint);
352+
params.inputPoints[i] = {x:inputPoint[0], y:inputPoint[1],tag:inputPoint[2]};
353+
}else{
354+
params.inputPoints[i] = {x:inputPoint.getCoordinates()[0], y:inputPoint.getCoordinates()[1],tag:inputPoint.tag};
353355
}
354-
params.inputPoints[i] = new SuperMap.Geometry.Point(inputPoint.getCoordinates()[0], inputPoint.getCoordinates()[1]);
356+
355357
}
356358
}
357359
if (params.points) {
@@ -363,7 +365,13 @@ export default class SpatialAnalystService extends ServiceBase {
363365
params.points[i] = new SuperMap.Geometry.Point(point.getCoordinates()[0], point.getCoordinates()[1]);
364366
}
365367
}
366-
368+
if (params.point) {
369+
var point = params.point;
370+
if (Util.isArray(point)) {
371+
point.setCoordinates(point);
372+
}
373+
params.point = new SuperMap.Geometry.Point(point.getCoordinates()[0], point.getCoordinates()[1]);
374+
}
367375
if (params.extractRegion) {
368376
params.extractRegion = this.convertGeometry(params.extractRegion);
369377
}
@@ -373,8 +381,19 @@ export default class SpatialAnalystService extends ServiceBase {
373381
if (params.sourceGeometry) {
374382
params.sourceGeometry = this.convertGeometry(params.sourceGeometry);
375383
}
376-
if (params.sourceRoute && params.sourceRoute.points) {
377-
params.sourceRoute.points = this.convertGeometry(params.sourceRoute.points);
384+
if (params.sourceRoute) {
385+
if(params.sourceRoute instanceof ol.geom.LineString&&params.sourceRoute.getCoordinates()){
386+
var target={};
387+
target.type="LINEM"
388+
target.parts=[params.sourceRoute.getCoordinates()[0].length];
389+
target.points = [];
390+
for(var i=0;i<params.sourceRoute.getCoordinates()[0].length;i++){
391+
var point=params.sourceRoute.getCoordinates()[0][i];
392+
target.points= target.points.concat({x:point[0], y: point[1],measure:point[2]})
393+
}
394+
params.sourceRoute = target;
395+
}
396+
378397
}
379398
if (params.operateRegions && Util.isArray(params.operateRegions)) {
380399
var me = this;

0 commit comments

Comments
 (0)