From 84bc6a3895ab9a63b3965e0278dfb5105443d0f7 Mon Sep 17 00:00:00 2001 From: Marco Rizzetto Date: Mon, 19 Jun 2017 22:07:32 +0200 Subject: [PATCH] Adding Colonias Penitenciarias Adding the layer "colonias penitenciarias" to the leaflet map, updating the geojson file with the data --- .../data/ColoniasPenitenciarias.geojson | 18 +++++++++--------- docs/colonizacion-leaflet/index.html | 15 +++++++++++++++ 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/docs/colonizacion-leaflet/data/ColoniasPenitenciarias.geojson b/docs/colonizacion-leaflet/data/ColoniasPenitenciarias.geojson index a592468..cabcc6f 100644 --- a/docs/colonizacion-leaflet/data/ColoniasPenitenciarias.geojson +++ b/docs/colonizacion-leaflet/data/ColoniasPenitenciarias.geojson @@ -2,14 +2,14 @@ "type": "FeatureCollection", "features": [ -{ "type": "Feature", "properties": { "ID": "SCPM1", "AGRUPACION": "1", "ENTIDAD": "La Corchuela", "MUNICIPIO": "Dos Hermanas", "ANYO INICI": "1939", "ANYO FINAL": 1944, "X ETRS89 U": 235974, "Y": 4127991, "field_9": "Canal del Bajo Guadalquivir y +", "Info": "El Canal de los Presos" }, "geometry": { "type": "Point", "coordinates": [ -5.97723294304128, 37.261081730628874 ] } }, -{ "type": "Feature", "properties": { "ID": "SCPM2", "AGRUPACION": "1", "ENTIDAD": "Los Merinales", "MUNICIPIO": "Dos Hermanas", "ANYO INICI": "1944", "ANYO FINAL": 1960, "X ETRS89 U": 237303, "Y": 4132469, "field_9": null, "Info": "El Canal de los Presos" }, "geometry": { "type": "Point", "coordinates": [ -5.963846798782418, 37.301768088468165 ] } }, -{ "type": "Feature", "properties": { "ID": "SCPM3", "AGRUPACION": "2", "ENTIDAD": "La Colonia", "MUNICIPIO": "Montijo", "ANYO INICI": "1941", "ANYO FINAL": 1957, "X ETRS89 U": 188429, "Y": 4313814, "field_9": "Canal de Montijo y +", "Info": "http:\/\/www.extremaduramisteriosa.com\/colonia-penitenciaria-militarizada-no2-de-montijo" }, "geometry": { "type": "Point", "coordinates": [ -6.593511883804979, 38.917950480148512 ] } }, -{ "type": "Feature", "properties": { "ID": "SCPM4", "AGRUPACION": "3", "ENTIDAD": "Campamento de la Sal", "MUNICIPIO": "Talavera de la Reina", "ANYO INICI": "1940", "ANYO FINAL": 1953, "X ETRS89 U": 352377, "Y": 4430639, "field_9": "Canal del Bajo Alberche", "Info": "Jose PEREZ CONDE - http:\/\/e-spacio.uned.es\/fez\/view\/tesisuned:GeoHis-Jperez" }, "geometry": { "type": "Point", "coordinates": [ -4.72970601528737, 40.013053662439603 ] } }, -{ "type": "Feature", "properties": { "ID": "SCPM5", "AGRUPACION": "3bis", "ENTIDAD": null, "MUNICIPIO": "Madrigal de la Vera", "ANYO INICI": "1953", "ANYO FINAL": 1959, "X ETRS89 U": 300052, "Y": 4443243, "field_9": "Canal del Rio Tietar", "Info": "Jose PEREZ CONDE - mas info http:\/\/www.encastillalamancha.es\/sociedad\/salvando-la-memoria-de-unos-presos-que-catapultaron-la-prosperidad-talaverana-fotos\/" }, "geometry": { "type": "Point", "coordinates": [ -5.34627083876536, 40.115748720241179 ] } }, -{ "type": "Feature", "properties": { "ID": "SCPM6", "AGRUPACION": "4", "ENTIDAD": null, "MUNICIPIO": "A�over del Tajo", "ANYO INICI": "1940", "ANYO FINAL": 1944, "X ETRS89 U": 438074, "Y": 4430598, "field_9": "Real Acequia del Jarama", "Info": "Jose PEREZ CONDE" }, "geometry": { "type": "Point", "coordinates": [ -3.725714718131677, 40.023322393349083 ] } }, -{ "type": "Feature", "properties": { "ID": "SCPM7", "AGRUPACION": "4", "ENTIDAD": null, "MUNICIPIO": "Navalmoral de la Mata", "ANYO INICI": "1950", "ANYO FINAL": 1953, "X ETRS89 U": 282823, "Y": 4419263, "field_9": "Pantano de Rosarito, rio Tietar", "Info": "Jose PEREZ CONDE" }, "geometry": { "type": "Point", "coordinates": [ -5.540244392621212, 39.895636676160478 ] } }, -{ "type": "Feature", "properties": { "ID": "SCPM8", "AGRUPACION": "6", "ENTIDAD": "Los Merinales", "MUNICIPIO": "Dos Hermanas", "ANYO INICI": "1942", "ANYO FINAL": 1944, "X ETRS89 U": 237303, "Y": 4132469, "field_9": "Canal del Bajo Guadalquivir y +", "Info": "El Canal de los Presos - http:\/\/www.elmundo.es\/elmundo\/2009\/05\/16\/andalucia_sevilla\/1242495819.html" }, "geometry": { "type": "Point", "coordinates": [ -5.963846798782418, 37.301768088468165 ] } }, -{ "type": "Feature", "properties": { "ID": "SCPM9", "AGRUPACION": "7", "ENTIDAD": null, "MUNICIPIO": "Vilanova de la Barca", "ANYO INICI": "?", "ANYO FINAL": 1956, "X ETRS89 U": 810191, "Y": 4622084, "field_9": "Canal de Arag�n y Catalu�a; Canal de la Violada", "Info": "El Canal de los Presos" }, "geometry": { "type": "Point", "coordinates": [ 0.727132941438467, 41.690094446661028 ] } } +{ "type": "Feature", "properties": { "ID": "SCPM1", "AGRUPACION": "1", "ENTIDAD": "La Corchuela", "MUNICIPIO": "Dos Hermanas", "ANYO_INI": "1939", "ANYO_FIN": 1944, "X ETRS89 U": 235974, "Y": 4127991, "field_9": "Canal del Bajo Guadalquivir y +", "Info": "El Canal de los Presos" }, "geometry": { "type": "Point", "coordinates": [ -5.97723294304128, 37.261081730628874 ] } }, +{ "type": "Feature", "properties": { "ID": "SCPM2", "AGRUPACION": "1", "ENTIDAD": "Los Merinales", "MUNICIPIO": "Dos Hermanas", "ANYO_INI": "1944", "ANYO_FIN": 1960, "X ETRS89 U": 237303, "Y": 4132469, "field_9": null, "Info": "El Canal de los Presos" }, "geometry": { "type": "Point", "coordinates": [ -5.963846798782418, 37.301768088468165 ] } }, +{ "type": "Feature", "properties": { "ID": "SCPM3", "AGRUPACION": "2", "ENTIDAD": "La Colonia", "MUNICIPIO": "Montijo", "ANYO_INI": "1941", "ANYO_FIN": 1957, "X ETRS89 U": 188429, "Y": 4313814, "field_9": "Canal de Montijo y +", "Info": "http:\/\/www.extremaduramisteriosa.com\/colonia-penitenciaria-militarizada-no2-de-montijo" }, "geometry": { "type": "Point", "coordinates": [ -6.593511883804979, 38.917950480148512 ] } }, +{ "type": "Feature", "properties": { "ID": "SCPM4", "AGRUPACION": "3", "ENTIDAD": "Campamento de la Sal", "MUNICIPIO": "Talavera de la Reina", "ANYO_INI": "1940", "ANYO_FIN": 1953, "X ETRS89 U": 352377, "Y": 4430639, "field_9": "Canal del Bajo Alberche", "Info": "Jose PEREZ CONDE - http:\/\/e-spacio.uned.es\/fez\/view\/tesisuned:GeoHis-Jperez" }, "geometry": { "type": "Point", "coordinates": [ -4.72970601528737, 40.013053662439603 ] } }, +{ "type": "Feature", "properties": { "ID": "SCPM5", "AGRUPACION": "3bis", "ENTIDAD": null, "MUNICIPIO": "Madrigal de la Vera", "ANYO_INI": "1953", "ANYO_FIN": 1959, "X ETRS89 U": 300052, "Y": 4443243, "field_9": "Canal del Rio Tietar", "Info": "Jose PEREZ CONDE - mas info http:\/\/www.encastillalamancha.es\/sociedad\/salvando-la-memoria-de-unos-presos-que-catapultaron-la-prosperidad-talaverana-fotos\/" }, "geometry": { "type": "Point", "coordinates": [ -5.34627083876536, 40.115748720241179 ] } }, +{ "type": "Feature", "properties": { "ID": "SCPM6", "AGRUPACION": "4", "ENTIDAD": null, "MUNICIPIO": "A�over del Tajo", "ANYO_INI": "1940", "ANYO_FIN": 1944, "X ETRS89 U": 438074, "Y": 4430598, "field_9": "Real Acequia del Jarama", "Info": "Jose PEREZ CONDE" }, "geometry": { "type": "Point", "coordinates": [ -3.725714718131677, 40.023322393349083 ] } }, +{ "type": "Feature", "properties": { "ID": "SCPM7", "AGRUPACION": "4", "ENTIDAD": null, "MUNICIPIO": "Navalmoral de la Mata", "ANYO_INI": "1950", "ANYO_FIN": 1953, "X ETRS89 U": 282823, "Y": 4419263, "field_9": "Pantano de Rosarito, rio Tietar", "Info": "Jose PEREZ CONDE" }, "geometry": { "type": "Point", "coordinates": [ -5.540244392621212, 39.895636676160478 ] } }, +{ "type": "Feature", "properties": { "ID": "SCPM8", "AGRUPACION": "6", "ENTIDAD": "Los Merinales", "MUNICIPIO": "Dos Hermanas", "ANYO_INI": "1942", "ANYO_FIN": 1944, "X ETRS89 U": 237303, "Y": 4132469, "field_9": "Canal del Bajo Guadalquivir y +", "Info": "El Canal de los Presos - http:\/\/www.elmundo.es\/elmundo\/2009\/05\/16\/andalucia_sevilla\/1242495819.html" }, "geometry": { "type": "Point", "coordinates": [ -5.963846798782418, 37.301768088468165 ] } }, +{ "type": "Feature", "properties": { "ID": "SCPM9", "AGRUPACION": "7", "ENTIDAD": null, "MUNICIPIO": "Vilanova de la Barca", "ANYO_INI": "?", "ANYO_FIN": 1956, "X ETRS89 U": 810191, "Y": 4622084, "field_9": "Canal de Arag�n y Catalu�a; Canal de la Violada", "Info": "El Canal de los Presos" }, "geometry": { "type": "Point", "coordinates": [ 0.727132941438467, 41.690094446661028 ] } } ] } diff --git a/docs/colonizacion-leaflet/index.html b/docs/colonizacion-leaflet/index.html index 0aea618..dbc9457 100644 --- a/docs/colonizacion-leaflet/index.html +++ b/docs/colonizacion-leaflet/index.html @@ -191,6 +191,21 @@ layer.addTo(mymap); } } + // Colonias Penitencia + if (layer.feature && layer.feature.properties && layer.feature.properties.ANYO_INI) { + var ini = parseInt(layer.feature.properties.ANYO_INI); + var fin = parseInt(layer.feature.properties.ANYO_FIN); + if (ini < ui.value && fin > ui.value) { + layer.options.fillOpacity = .8; + layer.remove(); + layer.addTo(mymap); + } + else { + layer.options.fillOpacity = 0; + layer.remove(); + layer.addTo(mymap); + } + } }); } });