File tree Expand file tree Collapse file tree 5 files changed +175
-156
lines changed Expand file tree Collapse file tree 5 files changed +175
-156
lines changed Original file line number Diff line number Diff line change @@ -219,29 +219,34 @@ export class MapLayer extends HTMLElement {
219219 let type = layerTypes [ j ] ;
220220 if ( this . checked && layer [ type ] ) {
221221 if ( type === '_templatedLayer' ) {
222- for ( let i = 0 ; i < layer . _extent . _mapExtents . length ; i ++ ) {
222+ for ( let i = 0 ; i < layer . _properties . _mapExtents . length ; i ++ ) {
223223 for (
224224 let j = 0 ;
225225 j <
226- layer . _extent . _mapExtents [ i ] . templatedLayer . _templates
226+ layer . _properties . _mapExtents [ i ] . templatedLayer . _templates
227227 . length ;
228228 j ++
229229 ) {
230230 if (
231- layer . _extent . _mapExtents [ i ] . templatedLayer . _templates [ j ]
232- . rel === 'query'
231+ layer . _properties . _mapExtents [ i ] . templatedLayer
232+ . _templates [ j ] . rel === 'query'
233233 )
234234 continue ;
235235 total ++ ;
236- layer . _extent . _mapExtents [ i ] . removeAttribute ( 'disabled' ) ;
237- layer . _extent . _mapExtents [ i ] . disabled = false ;
236+ layer . _properties . _mapExtents [ i ] . removeAttribute (
237+ 'disabled'
238+ ) ;
239+ layer . _properties . _mapExtents [ i ] . disabled = false ;
238240 if (
239- ! layer . _extent . _mapExtents [ i ] . templatedLayer . _templates [ j ]
240- . layer . isVisible
241+ ! layer . _properties . _mapExtents [ i ] . templatedLayer
242+ . _templates [ j ] . layer . isVisible
241243 ) {
242244 count ++ ;
243- layer . _extent . _mapExtents [ i ] . setAttribute ( 'disabled' , '' ) ;
244- layer . _extent . _mapExtents [ i ] . disabled = true ;
245+ layer . _properties . _mapExtents [ i ] . setAttribute (
246+ 'disabled' ,
247+ ''
248+ ) ;
249+ layer . _properties . _mapExtents [ i ] . disabled = true ;
245250 }
246251 }
247252 }
Original file line number Diff line number Diff line change @@ -206,7 +206,7 @@ export class MapFeature extends HTMLElement {
206206 layerEl . querySelectorAll ( 'map-feature' ) . length === 1
207207 ) {
208208 // if the map-feature is added to an empty layer, fire extentload to create vector layer
209- // must re-run _initialize of MapMLLayer.js to re-set layer._extent (layer._extent is null for an empty layer)
209+ // must re-run _initialize of MapMLLayer.js to re-set layer._properties (layer._properties is null for an empty layer)
210210 this . _layer . _initialize ( layerEl ) ;
211211 this . _layer . fire ( 'extentload' ) ;
212212 }
Original file line number Diff line number Diff line change @@ -109,20 +109,20 @@ export var LayerControl = L.Control.Layers.extend({
109109 }
110110 // check if an extent is disabled and disable it
111111 if (
112- this . _layers [ i ] . layer . _extent &&
113- this . _layers [ i ] . layer . _extent . _mapExtents
112+ this . _layers [ i ] . layer . _properties &&
113+ this . _layers [ i ] . layer . _properties . _mapExtents
114114 ) {
115115 for (
116116 let j = 0 ;
117- j < this . _layers [ i ] . layer . _extent . _mapExtents . length ;
117+ j < this . _layers [ i ] . layer . _properties . _mapExtents . length ;
118118 j ++
119119 ) {
120120 let input =
121- this . _layers [ i ] . layer . _extent . _mapExtents [ j ] . extentAnatomy ,
121+ this . _layers [ i ] . layer . _properties . _mapExtents [ j ] . extentAnatomy ,
122122 label = input . getElementsByClassName ( 'mapml-layer-item-name' ) [ 0 ] ;
123123 if (
124- this . _layers [ i ] . layer . _extent . _mapExtents [ j ] . disabled &&
125- this . _layers [ i ] . layer . _extent . _mapExtents [ j ] . checked
124+ this . _layers [ i ] . layer . _properties . _mapExtents [ j ] . disabled &&
125+ this . _layers [ i ] . layer . _properties . _mapExtents [ j ] . checked
126126 ) {
127127 label . style . fontStyle = 'italic' ;
128128 input . disabled = true ;
Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ export var QueryHandler = L.Handler.extend({
5050 _query ( e , layer ) {
5151 var zoom = e . target . getZoom ( ) ,
5252 map = this . _map ,
53- crs = layer . _extent . crs , // the crs for each extent would be the same
53+ crs = layer . _properties . crs , // the crs for each extent would be the same
5454 tileSize = map . options . crs . options . crs . tile . bounds . max . x ,
5555 container = layer . _container ,
5656 popupOptions = {
You can’t perform that action at this time.
0 commit comments