Skip to content

Commit e675e30

Browse files
songyumengsongyumeng
committed
Merge branch 'master' of https://github.com/SuperMap/iClient9 
2 parents 4165e64 + 3202a65 commit e675e30

File tree

8 files changed

+1250
-1610
lines changed

8 files changed

+1250
-1610
lines changed

‎dist/iclient9-leaflet.js‎

Lines changed: 1225 additions & 1486 deletions
Large diffs are not rendered by default.

‎dist/iclient9-openlayers.css‎

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: 2 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -86031,7 +86031,7 @@ var VectorTileStyles = function (_ol$Observable) {
8603186031
value: function getFeatureStyle(feature) {
8603286032
var selectedStyle;
8603386033
var layerName = feature.getProperties().layerName || feature.getProperties().layer;
86034-
var id = feature.getProperties().id || feature.id_;
86034+
var id = feature.getProperties().id || parseInt(feature.getProperties().SmID);
8603586035
if (feature.getProperties().type && feature.getProperties().type.toUpperCase() === 'TEXT') {
8603686036
selectedStyle = _olDebug2.default.supermap.VectorTileStyles.getSelectedStyle(feature.getProperties().type.toUpperCase());
8603786037
if (feature.getProperties().texts) {
@@ -92030,108 +92030,7 @@ module.exports = whatwgFetch;
9203092030
/* 439 */
9203192031
/***/ (function(module, exports) {
9203292032

92033-
module.exports = {
92034-
"_from": "proj4@2.3.15",
92035-
"_id": "proj4@2.3.15",
92036-
"_inBundle": false,
92037-
"_integrity": "sha1-WtBui8owvg/6OJpJ5FZfUfBtCJ4=",
92038-
"_location": "/proj4",
92039-
"_phantomChildren": {},
92040-
"_requested": {
92041-
"type": "version",
92042-
"registry": true,
92043-
"raw": "proj4@2.3.15",
92044-
"name": "proj4",
92045-
"escapedName": "proj4",
92046-
"rawSpec": "2.3.15",
92047-
"saveSpec": null,
92048-
"fetchSpec": "2.3.15"
92049-
},
92050-
"_requiredBy": [
92051-
"/"
92052-
],
92053-
"_resolved": "http://registry.npm.taobao.org/proj4/download/proj4-2.3.15.tgz",
92054-
"_shasum": "5ad06e8bca30be0ffa389a49e4565f51f06d089e",
92055-
"_spec": "proj4@2.3.15",
92056-
"_where": "F:\\dev\\iClient",
92057-
"author": "",
92058-
"bugs": {
92059-
"url": "https://github.com/proj4js/proj4js/issues"
92060-
},
92061-
"bundleDependencies": false,
92062-
"contributors": [
92063-
{
92064-
"name": "Mike Adair",
92065-
"email": "madair@dmsolutions.ca"
92066-
},
92067-
{
92068-
"name": "Richard Greenwood",
92069-
"email": "rich@greenwoodmap.com"
92070-
},
92071-
{
92072-
"name": "Calvin Metcalf",
92073-
"email": "calvin.metcalf@gmail.com"
92074-
},
92075-
{
92076-
"name": "Richard Marsden",
92077-
"url": "http://www.winwaed.com"
92078-
},
92079-
{
92080-
"name": "T. Mittan"
92081-
},
92082-
{
92083-
"name": "D. Steinwand"
92084-
},
92085-
{
92086-
"name": "S. Nelson"
92087-
}
92088-
],
92089-
"dependencies": {
92090-
"mgrs": "~0.0.2"
92091-
},
92092-
"deprecated": false,
92093-
"description": "Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.",
92094-
"devDependencies": {
92095-
"browserify": "~12.0.1",
92096-
"chai": "~1.8.1",
92097-
"curl": "git://github.com/cujojs/curl.git",
92098-
"grunt": "~0.4.2",
92099-
"grunt-browserify": "~4.0.1",
92100-
"grunt-cli": "~0.1.13",
92101-
"grunt-contrib-connect": "~0.6.0",
92102-
"grunt-contrib-jshint": "~0.8.0",
92103-
"grunt-contrib-uglify": "~0.11.1",
92104-
"grunt-mocha-phantomjs": "~0.4.0",
92105-
"istanbul": "~0.2.4",
92106-
"mocha": "~1.17.1",
92107-
"tin": "~0.4.0"
92108-
},
92109-
"directories": {
92110-
"test": "test",
92111-
"doc": "docs"
92112-
},
92113-
"homepage": "https://github.com/proj4js/proj4js#readme",
92114-
"jam": {
92115-
"main": "dist/proj4.js",
92116-
"include": [
92117-
"dist/proj4.js",
92118-
"README.md",
92119-
"AUTHORS",
92120-
"LICENSE.md"
92121-
]
92122-
},
92123-
"license": "MIT",
92124-
"main": "lib/index.js",
92125-
"name": "proj4",
92126-
"repository": {
92127-
"type": "git",
92128-
"url": "git://github.com/proj4js/proj4js.git"
92129-
},
92130-
"scripts": {
92131-
"test": "./node_modules/istanbul/lib/cli.js test ./node_modules/mocha/bin/_mocha test/test.js"
92132-
},
92133-
"version": "2.3.15"
92134-
};
92033+
module.exports = {"_from":"proj4@2.3.15","_id":"proj4@2.3.15","_inBundle":false,"_integrity":"sha1-WtBui8owvg/6OJpJ5FZfUfBtCJ4=","_location":"/proj4","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"proj4@2.3.15","name":"proj4","escapedName":"proj4","rawSpec":"2.3.15","saveSpec":null,"fetchSpec":"2.3.15"},"_requiredBy":["/"],"_resolved":"https://registry.npmjs.org/proj4/-/proj4-2.3.15.tgz","_shasum":"5ad06e8bca30be0ffa389a49e4565f51f06d089e","_spec":"proj4@2.3.15","_where":"F:\\codes\\iClient9Copy\\iClient9","author":"","bugs":{"url":"https://github.com/proj4js/proj4js/issues"},"bundleDependencies":false,"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":"~0.0.2"},"deprecated":false,"description":"Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.","devDependencies":{"browserify":"~12.0.1","chai":"~1.8.1","curl":"git://github.com/cujojs/curl.git","grunt":"~0.4.2","grunt-browserify":"~4.0.1","grunt-cli":"~0.1.13","grunt-contrib-connect":"~0.6.0","grunt-contrib-jshint":"~0.8.0","grunt-contrib-uglify":"~0.11.1","grunt-mocha-phantomjs":"~0.4.0","istanbul":"~0.2.4","mocha":"~1.17.1","tin":"~0.4.0"},"directories":{"test":"test","doc":"docs"},"homepage":"https://github.com/proj4js/proj4js#readme","jam":{"main":"dist/proj4.js","include":["dist/proj4.js","README.md","AUTHORS","LICENSE.md"]},"license":"MIT","main":"lib/index.js","name":"proj4","repository":{"type":"git","url":"git://github.com/proj4js/proj4js.git"},"scripts":{"test":"./node_modules/istanbul/lib/cli.js test ./node_modules/mocha/bin/_mocha test/test.js"},"version":"2.3.15"}
9213592034

9213692035
/***/ }),
9213792036
/* 440 */

‎dist/iclient9-openlayers.min.css‎

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.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.

‎examples/leaflet/dataFlowService.html‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
<script type="text/javascript">
1111
var host = window.isLocal ? window.server : "http://117.122.248.69:8090";
1212
var wsHost = "ws:\//" + (window.isLocal ? document.location.hostname + ":8800" : "117.122.248.69:8800");
13-
var token = "ObpcGH_Q3L4d6Ow1FLJlbvn-3joeHSL4puxenZr-hBbG3bqnziyGSf705LFwcMWR48cgIBRb5UH1AghE9HVPSQ..";
13+
var token = "15xQ_l77895DvXHYKWPesgip1mX0VFiT0Xa5kaPi0WakyfhWyX9QwS6yv3Jn1-ByBvKbkI4wrdFDlZL5X6Utow..";
1414
var map,
15-
urlMap = host + "/iserver/services/map-china400/rest/maps/China",
16-
urlQuery = host + "/iserver/services/map-china400/rest/maps/China_4326",
17-
urlDataFlow = wsHost + "/iserver/services/dataflow/dataflow";
15+
urlMap = host + "/iserver/services/map-china400/rest/maps/China",
16+
urlQuery = host + "/iserver/services/map-china400/rest/maps/China_4326",
17+
urlDataFlow = wsHost + "/iserver/services/dataflow/dataflow";
1818
map = L.map('map', {
1919
preferCanvas: true,
2020
crs: L.CRS.EPSG3857,
@@ -27,6 +27,7 @@
2727
SuperMap.SecurityManager.registerToken(urlDataFlow, token);
2828
}
2929

30+
var popup = L.popup({offset: L.point(0, 0), autoPan: true});
3031
//创建DataFlowLayer，创建DataFlowLayer订阅DataFlow并将结果加载到地图上
3132
var dataFlowLayer = L.supermap.dataFlowLayer(urlDataFlow, {
3233
style: function (feature) {
@@ -38,10 +39,11 @@
3839
};
3940
},
4041
onEachFeature: function (feature, layer) {
41-
L.popup({offset: L.point(0, 0)})
42-
.setLatLng(L.GeoJSON.coordsToLatLng(feature.geometry.coordinates))
43-
.setContent(feature.properties.time)
44-
.openOn(map);
42+
popup.setLatLng(L.GeoJSON.coordsToLatLng(feature.geometry.coordinates))
43+
.setContent(feature.properties.time);
44+
if (!popup.isOpen()) {
45+
popup.addTo(map);
46+
}
4547
},
4648
//geometry:{coordinates:[[[116.381741960923,39.8765100055449],[116.414681699817,39.8765100055449],[116.414681699817,39.8415115329708],[116.381741960923, 39.8415115329708],[116.381741960923,39.8765100055449]]],type:"Polygon"},
4749
// excludeField:["id"]
@@ -61,14 +63,14 @@
6163
}
6264
});
6365
L.supermap
64-
.queryService(urlQuery)
65-
.queryBySQL(param, function (serviceResult) {
66-
featureResult = serviceResult;
67-
dataFlowService = L.supermap.dataFlowService(urlDataFlow).initBroadcast();
68-
dataFlowService.on('broadcastSocketConnected', function (e) {
69-
timer = window.setInterval("broadcast()", 2000);
70-
})
71-
});
66+
.queryService(urlQuery)
67+
.queryBySQL(param, function (serviceResult) {
68+
featureResult = serviceResult;
69+
dataFlowService = L.supermap.dataFlowService(urlDataFlow).initBroadcast();
70+
dataFlowService.on('broadcastSocketConnected', function (e) {
71+
timer = window.setInterval("broadcast()", 2000);
72+
})
73+
});
7274
}
7375

7476
var count = 200;

‎src/leaflet/overlay/theme/ThemeLayer.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ export var ThemeLayer = L.Layer.extend({
390390
coor = L.point(coordinate[0], coordinate[1]);
391391
} else if (!(coordinate instanceof L.Point)) {
392392
if (coordinate instanceof Point || coordinate instanceof GeoText) {
393-
coor = L.point(coordinate.x, coordinate.y,);
393+
coor = L.point(coordinate.x, coordinate.y);
394394
} else {
395395
coor = L.point(coordinate.lon, coordinate.lat);
396396
}

‎src/openlayers/overlay/vectortile/VectorTileStyles.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ export default class VectorTileStyles extends ol.Observable {
510510
getFeatureStyle(feature) {
511511
var selectedStyle;
512512
var layerName = feature.getProperties().layerName || feature.getProperties().layer;
513-
var id = feature.getProperties().id || feature.id_;
513+
var id = feature.getProperties().id || parseInt(feature.getProperties().SmID);
514514
if (feature.getProperties().type && feature.getProperties().type.toUpperCase() === 'TEXT') {
515515
selectedStyle = ol.supermap.VectorTileStyles.getSelectedStyle(feature.getProperties().type.toUpperCase());
516516
if (feature.getProperties().texts) {

0 commit comments

Comments
 (0)