@@ -26,17 +26,19 @@ <h4 class="modal-title">提示</h4>
2626< script type ="text/javascript " src ="http://cdn.bootcss.com/leaflet/1.0.3/leaflet.js "> </ script >
2727< script type ="text/javascript " src ="../../dist/iclient9-leaflet.js "> </ script >
2828< script type ="text/javascript ">
29- var layer , baseLayer , processingJobsUrl = "http://113.209.64.227:8090/iserver/services/processing/rest/v1/jobs" ,
29+ var layer , processingJobsUrl = "http://113.209.64.227:8090/iserver/services/processing/rest/v1/jobs" ,
3030 token = 'GSHB7qlocJkqEH0Ld6VUSGQfekOdPd3e9UdJoHjiupfbkGDggXQLSPWd6VaKm8NH4gvXx6UQ0TCI5wpfr-4Tlw..' ,
31- worldMapUrl = 'http://113.209.64.227:8090/iserver/services/map-World/rest/maps/世界地图_Day' ,
3231 map = L . map ( 'map' , {
33- crs : L . CRS . EPSG4326 ,
32+ crs : L . CRS . TianDiTu_WGS84 ,
3433 center : [ 40.75 , - 73.95 ] ,
3534 maxZoom : 18 ,
3635 zoom : 12
3736 } ) ,
3837 info = L . control ( { position : 'topright' } ) ;
39-
38+ L . supermap . tiandituTileLayer ( "http://t{s}.tianditu.com/vec_c/wmts" , {
39+ layer : "vec" ,
40+ tilematrixSet : "c"
41+ } ) . addTo ( map ) ;
4042 info . onAdd = function ( ) {
4143 var popup = L . DomUtil . create ( 'div' ) ;
4244 popup . style = 'width:20%' ;
@@ -47,16 +49,20 @@ <h4 class="modal-title">提示</h4>
4749 "<div class='panel-body'>" +
4850 "<div class='input-group'>" +
4951 "<span class='input-group-addon'>输入数据</span>" +
50- "<input id='datasetName' type='text' class='form-control' placeholder='test_newyork_taxi_2013_01_14k'/>" +
51- "</div><p>" +
52+ "<div>" +
53+ "<select class='form-control' id='datasetName' name='clientType'>" +
54+ "<option selected='selected'>test_newyork_taxi_2013_01_14k</option>" +
55+ "</select> </div> </div> <p>" +
5256 "<div class='input-group'>" +
5357 "<span class='input-group-addon'>缓存类型</span>" +
54- "<input id='imageType' type='text' class='form-control' placeholder='Heatmap'/>" +
55- "</div><p>" +
58+ "<div>" +
59+ "<select class='form-control' id='imageType' name='clientType'>" +
60+ "<option value='Heatmap' selected='selected'>热度图</option>" +
61+ "</select> </div> </div> <p>" +
5662 "<div class='input-group'>" +
5763 "<span class='input-group-addon'>缓存范围</span>" +
5864 "<input id='bounds' type='text' class='form-control' placeholder='-74.050, 40.650, -73.850, 40.850'/>" +
59- "</div><p>" +
65+ "</div> <p>" +
6066 "<div class='input-group'>" +
6167 "<span class='input-group-addon'>缓存比例尺级别</span>" +
6268 "<input id='level' type='text' class='form-control' placeholder='5'/>" +
@@ -67,8 +73,10 @@ <h4 class="modal-title">提示</h4>
6773 "</div><p>" +
6874 "<div class='input-group'>" +
6975 "<span class='input-group-addon'>存储类型</span>" +
70- "<input id='cacheType' type='text' class='form-control' placeholder='MongoDB'/>" +
71- "</div><p>" +
76+ "<div>" +
77+ "<select class='form-control' id='cacheType' name='clientType'>" +
78+ "<option selected='selected'>MongoDB</option>" +
79+ "</select></div></div><p>" +
7280 "<div class='input-group'>" +
7381 "<span class='input-group-addon'>服务地址</span>" +
7482 "<input id='serverAdresses' type='text' class='form-control' placeholder='113.209.64.227:27010'/>" +
@@ -96,12 +104,12 @@ <h4 class="modal-title">提示</h4>
96104 var buildCacheJobParameter = new SuperMap . BuildCacheJobParameter ( {
97105 datasetName : $ ( '#datasetName' ) . val ( ) || $ ( '#datasetName' ) . attr ( 'placeholder' ) ,
98106 cacheName : $ ( '#cacheName' ) . val ( ) || $ ( '#cacheName' ) . attr ( 'placeholder' ) ,
99- cacheType : $ ( '#cacheType' ) . val ( ) || $ ( '#cacheType' ) . attr ( 'placeholder' ) ,
107+ cacheType : $ ( '#cacheType option:selected' ) . text ( ) ,
100108 serverAdresses : serverAddress ,
101109 database : $ ( '#database' ) . val ( ) || $ ( '#database' ) . attr ( 'placeholder' ) ,
102110 version : $ ( '#version' ) . val ( ) || $ ( '#version' ) . attr ( 'placeholder' ) ,
103- bounds : bounds ,
104- imageType : $ ( '#imageType' ) . val ( ) || $ ( '#imageType' ) . attr ( 'placeholder ' ) ,
111+ bounds : L . latLngBounds ( L . latLng ( bounds [ 1 ] , bounds [ 0 ] ) , L . latLng ( bounds [ 3 ] , bounds [ 2 ] ) ) ,
112+ imageType : $ ( '#imageType option:selected' ) . attr ( 'value ' ) ,
105113 level : parseInt ( $ ( '#level' ) . val ( ) || $ ( '#level' ) . attr ( 'placeholder' ) )
106114 } ) ;
107115 processingJobsService = new L . supermap . processingJobsService ( processingJobsUrl ) ;
@@ -111,9 +119,8 @@ <h4 class="modal-title">提示</h4>
111119 $ ( '#btn' ) . on ( 'click' , function ( ) {
112120 $ ( '#btn' ) . prop ( 'disabled' , true ) ;
113121 $ ( "#model" ) . modal ( { show : true , backdrop : 'static' , keyboard : false } ) ;
114- if ( map && layer && baseLayer ) {
122+ if ( map && layer ) {
115123 map . removeLayer ( layer ) ;
116- map . removeLayer ( baseLayer ) ;
117124 }
118125 processingJobsService . addBuildCacheJob ( buildCacheJobParameter , function ( serviceResult ) {
119126 if ( serviceResult . error ) {
@@ -128,9 +135,7 @@ <h4 class="modal-title">提示</h4>
128135 return response . json ( ) ;
129136 } ) . then ( function ( result ) {
130137 var mapUrl = result [ 0 ] . path ;
131- baseLayer = L . supermap . tiledMapLayer ( worldMapUrl , { noWrap : true } ) ;
132138 layer = L . supermap . tiledMapLayer ( mapUrl , { noWrap : true , transparent : true } ) ;
133- baseLayer . addTo ( map ) ;
134139 layer . addTo ( map ) ;
135140 $ ( "#model" ) . modal ( 'hide' ) ;
136141 $ ( '#btn' ) . prop ( 'disabled' , false ) ;
0 commit comments