From 9d62a37b123c575111af77da2eead7017acfab91 Mon Sep 17 00:00:00 2001 From: Igor I Date: Wed, 17 Sep 2025 17:15:40 +0500 Subject: [PATCH] GeoJSON --- org-ccalm-main.yml | 4 +- src/main/java/org/ccalm/main/GeoGSON.java | 8 +- src/main/java/org/ccalm/main/QGIS.java | 77 +- .../resources/QGIS/frmlocust_pods_density.qgs | 3785 +++++++---------- 4 files changed, 1622 insertions(+), 2252 deletions(-) diff --git a/org-ccalm-main.yml b/org-ccalm-main.yml index f49dccd..74cf477 100644 --- a/org-ccalm-main.yml +++ b/org-ccalm-main.yml @@ -10,8 +10,8 @@ spring: application: name: org-ccalm-main datasource: - url: jdbc:postgresql://10.0.0.1:5432/CCALM?ApplicationName=org_ccalm_main&connectTimeout=10000&socketTimeout=30000 - #url: jdbc:postgresql://ccalm.org:5432/CCALM?ApplicationName=org_ccalm_main&ssl=true&sslmode=require&connectTimeout=10000&socketTimeout=10000 + #url: jdbc:postgresql://10.0.0.1:5432/CCALM?ApplicationName=org_ccalm_main&connectTimeout=10000&socketTimeout=30000 + url: jdbc:postgresql://ccalm.org:5432/CCALM?ApplicationName=org_ccalm_main&ssl=true&sslmode=require&connectTimeout=10000&socketTimeout=10000 #url: jdbc:postgresql://127.0.0.1:5432/CCALM?ApplicationName=org_ccalm_main&ssl=true&sslmode=require&connectTimeout=10000&socketTimeout=10000 username: postgres password: 309A86FF65A78FB428F4E38DFE35F730 diff --git a/src/main/java/org/ccalm/main/GeoGSON.java b/src/main/java/org/ccalm/main/GeoGSON.java index b2f2bc7..6c14133 100644 --- a/src/main/java/org/ccalm/main/GeoGSON.java +++ b/src/main/java/org/ccalm/main/GeoGSON.java @@ -263,8 +263,8 @@ public class GeoGSON implements ServletContextAware { @ResponseBody public ResponseEntity podsDensity( @RequestParam(required = false, name = "country_id", defaultValue = "5") Integer countryId, - @RequestParam(required = false, name = "date_from", defaultValue = "1750227418") Long dateFromUnix, - @RequestParam(required = false, name = "date_to", defaultValue = "1758010618") Long dateToUnix, + @RequestParam(required = false, name = "date_start", defaultValue = "1750227418") Long dateStartUnix, + @RequestParam(required = false, name = "date_end", defaultValue = "1758010618") Long dateEndUnix, @CookieValue(value = "lng", defaultValue = "1") String language_id, HttpServletRequest request // Добавляем для получения заголовка Range ) { @@ -284,8 +284,8 @@ public class GeoGSON implements ServletContextAware { MapSqlParameterSource params = new MapSqlParameterSource(); params.addValue("countryId", countryId); - params.addValue("dateFrom", dateFromUnix); - params.addValue("dateTo", dateToUnix); + params.addValue("dateFrom", dateStartUnix); + params.addValue("dateTo", dateEndUnix); List> rows = jdbcTemplate.queryForList(sql, params); diff --git a/src/main/java/org/ccalm/main/QGIS.java b/src/main/java/org/ccalm/main/QGIS.java index 977b63b..24ef0df 100644 --- a/src/main/java/org/ccalm/main/QGIS.java +++ b/src/main/java/org/ccalm/main/QGIS.java @@ -1,7 +1,9 @@ package org.ccalm.main; - +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.time.format.DateTimeFormatter; import java.io.BufferedReader; import java.io.FileInputStream; @@ -63,7 +65,9 @@ public class QGIS implements ServletContextAware { //TEST https://127.0.0.1:8083/api/locust/v01/QGIS?name=SMAP&date=2025-05-30 //TEST https://ccalm.org/api/locust/v01/QGIS?name=SMAP&day=150 - @RequestMapping(value = {"/QGIS", "/api/locust/v01/QGIS"},method = RequestMethod.GET,produces = "application/octet-stream") + @RequestMapping( + value = {"/QGIS", "/api/locust/v01/QGIS"}, + method = RequestMethod.GET,produces = "application/octet-stream") @ResponseBody public HttpEntity ajaxTamer( @ModelAttribute User user, @@ -98,8 +102,7 @@ public class QGIS implements ServletContextAware { } catch (Exception ex) { logger.info(ex.getMessage()); } - - + //Return content QGIS file. HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_OCTET_STREAM); @@ -108,7 +111,71 @@ public class QGIS implements ServletContextAware { String fileAsString=""; //Pods (кубышки) - if(name!=null && (name.equals("frmlocust_pods_density") || name.equals("frmlocust_hoppers_density") || name.equals("frmlocust_bands") || name.equals("frmlocust_adults_density") || name.equals("frmlocust_swarms"))) + //TODO NEW format + if(name!=null && (name.equals("frmlocust_pods_density"))) + { + fileAsString = fileToString("static/resources/QGIS/" + name + ".qgs"); + + //String country_id=request.getParameter("country_id"); + //String locust_type_id=request.getParameter("locust_type_id"); + //String date_start=request.getParameter("date_start"); + //String date_end=request.getParameter("date_end"); + //String registered=request.getParameter("registered"); + + //Make SQL + String sql = "mode=1"; + String sql2 = "mode=1"; + if(country_id!=null && !country_id.isEmpty()) + { + if(country_id.equals("-1")) + { + //sql+=" and country_id in (7,3,4,2)"; TODO + //sql2+=" and country_id in (7,3,4,2)"; TODO + }else if(country_id.equals("-2")) + { + //sql+=" and country_id in (7,1,5,6,8,9,10)"; TODO + //sql2+=" and country_id in (7,1,5,6,8,9,10)"; TODO + }else + { + sql+="&country_id="+country_id; + sql2+="&country_id="+country_id; + } + } + if(locust_type_id!=null && !locust_type_id.isEmpty()) + { + sql+="&locust_type_id="+locust_type_id; + } + if(date_start!=null && !date_start.isEmpty()) + { + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + LocalDateTime localDateTime = LocalDateTime.parse(date_start, formatter); + long epochSeconds = localDateTime.toEpochSecond(ZoneOffset.UTC); + sql+="&date_start="+epochSeconds; + } + if(date_end!=null && !date_end.isEmpty()) + { + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + LocalDateTime localDateTime = LocalDateTime.parse(date_start, formatter); + long epochSeconds = localDateTime.toEpochSecond(ZoneOffset.UTC); + sql+="&date_end="+epochSeconds; + } + + if(registered!=null && registered.equals("1")) + { + sql+="&registered=true"; + }else + if(registered!=null && registered.equals("0")) + { + sql+="&registered=false"; + } + + //Apply variables to text + fileAsString=fileAsString.replaceAll("\\$\\{params\\}",sql); + fileAsString=fileAsString.replaceAll("\\$\\{params2\\}",sql2); + + } + //TODO OLD format + if(name!=null && (name.equals("frmlocust_hoppers_density") || name.equals("frmlocust_bands") || name.equals("frmlocust_adults_density") || name.equals("frmlocust_swarms"))) { fileAsString = fileToString("static/resources/QGIS/" + name + ".qgs"); diff --git a/src/main/resources/static/resources/QGIS/frmlocust_pods_density.qgs b/src/main/resources/static/resources/QGIS/frmlocust_pods_density.qgs index 5a8f6bf..611a754 100644 --- a/src/main/resources/static/resources/QGIS/frmlocust_pods_density.qgs +++ b/src/main/resources/static/resources/QGIS/frmlocust_pods_density.qgs @@ -1,5 +1,5 @@ - + @@ -30,56 +30,61 @@ false - + - + - + - + - + - + - view_frmlocust_pods_density20170220095821682 - countriesdistricts20170803132507662 - countriesregions20170803132506793 - countries20170803132508430 _b108e5bb_8a9b_4812_b07b_7de5dc3e4a73 + frmlocust_pods_density_bfae933f_2a09_41ef_8930_0fe505abb25d + countries_country_id_5_5f4c929d_31e6_4876_9aa8_0643fd01ffc1 + countriesregions_country_id_5_e57296d1_b498_427f_8341_dc5ab865e362 + countriesdistricts_country_id_5_53ec6a35_6cc3_4056_8433_fd95ac45811e - - + + + + + + + - + meters - 4606484.67266767099499702 - 3728012.39886604063212872 - 9866330.61264913156628609 - 8074944.57324538938701153 + 3926611.30739561561495066 + 3811597.01965953782200813 + 10227163.09416929632425308 + 9018607.18512584641575813 0 @@ -100,34 +105,59 @@ - - - + + degrees + + 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368 + 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368 + -179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368 + -179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368 + + 0 + + + GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],MEMBER["World Geodetic System 1984 (G2296)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] + +proj=longlat +datum=WGS84 +no_defs + 3452 + 4326 + EPSG:4326 + WGS 84 + longlat + EPSG:7030 + true + + + 0 + + + __________82f194d6_ede0_418f_90e1_5c543058f54e @@ -188,7 +218,7 @@ - + -20037508.34278924390673637 -20037508.34278924763202667 @@ -202,7 +232,7 @@ 85.05112877980660357 _b108e5bb_8a9b_4812_b07b_7de5dc3e4a73 - type=xyz&url=https://tile.openstreetmap.org/%7Bz%7D/%7Bx%7D/%7By%7D.png&zmax=19&zmin=0 + crs=EPSG:3857&format&type=xyz&url=https://tile.openstreetmap.org/%7Bz%7D/%7Bx%7D/%7By%7D.png&zmax=19&zmin=0 @@ -228,7 +258,7 @@ Тайлы OpenStreetMap Проект OpenStreetMap создан картографическим сообществом, создающим и распространяющим данные о дорогах, территориях, границах и многом другом по всему миру. - + @@ -250,12 +280,12 @@ - + wms - + @@ -267,97 +297,97 @@ 1 0 - + - + - + - + - + - + @@ -366,22 +396,22 @@ - + - + None @@ -392,14 +422,14 @@ 2 - - + + resamplingFilter 0 - + 46.49216100000000296 40.56864759999999848 @@ -412,8 +442,8 @@ 87.31563160000000323 55.48040019999999828 - countries20170803132508430 - dbname='CCALM' host=ccalm.org port=5432 user='guest' password='B2C0D5C60590' sslmode=disable key='country_id' srid=4326 type=MultiPolygon table="main"."view_countries" (geom) sql=${sql2} + countries_country_id_5_5f4c929d_31e6_4876_9aa8_0643fd01ffc1 + /vsicurl/https://ccalm.org/api/locust/v01/geojson/countries?${params2}|layername=countries?${params2} @@ -435,35 +465,52 @@ - + dataset + + + + + + + + + - - - 0 - 0 - - - - - false + GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],MEMBER["World Geodetic System 1984 (G2296)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] + +proj=longlat +datum=WGS84 +no_defs + 3452 + 4326 + EPSG:4326 + WGS 84 + longlat + EPSG:7030 + true - + + + + + + + + + - postgres + ogr - - + + @@ -473,173 +520,173 @@ 1 0 - + - + - + - + - + - + - + - + - + - + - + @@ -649,242 +696,257 @@ + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + - + + + + + + + + + + + + - + - - - + + + - 0 0 - 0.7 - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + - + + + - + - - + + - - + + - + + + + + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - + - @@ -892,10 +954,10 @@ - . + 0 - . + 0 generatedlayout - - - + + + + + + + + + + + + + + + "name" - + - 46.49321789999999055 - 40.56864760034125084 - 87.31563359999998397 - 55.44217009956796005 + 46.49321789999999766 + 40.56864759999999848 + 87.31563359999999818 + 55.44217009999999846 - 46.49321789999999055 - 40.56864760034125084 - 87.31563359999998397 - 55.44217009956796005 + 46.49321789999999766 + 40.56864759999999848 + 87.31563359999999818 + 55.44217009999999846 - countriesdistricts20170803132507662 - dbname='CCALM' host=ccalm.org port=5432 user='guest' password='B2C0D5C60590' sslmode=disable key='id' srid=4326 type=MultiPolygon table="main"."view_countriesdistricts" (geom) sql=${sql2} + countriesdistricts_country_id_5_53ec6a35_6cc3_4056_8433_fd95ac45811e + /vsicurl/https://ccalm.org/api/locust/v01/geojson/countriesdistricts?${params2}|layername=countriesdistricts?${params2} @@ -959,29 +1033,46 @@ def my_form_open(dialog, layer, feature): - + dataset + + + + + + + + + - - - 0 - 0 - - - - - false + GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],MEMBER["World Geodetic System 1984 (G2296)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] + +proj=longlat +datum=WGS84 +no_defs + 3452 + 4326 + EPSG:4326 + WGS 84 + longlat + EPSG:7030 + true - + + + + + + + + + - postgres + ogr @@ -997,173 +1088,173 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + @@ -1173,307 +1264,299 @@ def my_form_open(dialog, layer, feature): + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + - + + + + + + + + + + + + - + - - - + + + - 0 0 - 0.7 - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + - + + + - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - + + + + - @@ -1481,52 +1564,71 @@ def my_form_open(dialog, layer, feature): - . + 0 - . - + 0 generatedlayout - - - + + + + + + + + + + + + + + + + + + + + + + + + "name" - + - 46.49321789999999055 - 40.56864760034125084 - 87.31563359999998397 - 55.44217009956796005 + 46.49321789999999766 + 40.56864759999999848 + 87.31563359999999818 + 55.44217009999999846 - 46.49321789999999055 - 40.56864760034125084 - 87.31563359999998397 - 55.44217009956796005 + 46.49321789999999766 + 40.56864759999999848 + 87.31563359999999818 + 55.44217009999999846 - countriesregions20170803132506793 - dbname='CCALM' host=ccalm.org port=5432 user='guest' password='B2C0D5C60590' sslmode=disable key='id' srid=4326 type=MultiPolygon table="main"."view_countriesregions" (geom) sql=${sql2} + countriesregions_country_id_5_e57296d1_b498_427f_8341_dc5ab865e362 + /vsicurl/https://ccalm.org/api/locust/v01/geojson/countriesregions?${params2}|layername=countriesregions?${params2} @@ -1548,29 +1650,46 @@ def my_form_open(dialog, layer, feature): - + dataset + + + + + + + + + - - - 0 - 0 - - - - - false + GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],MEMBER["World Geodetic System 1984 (G2296)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] + +proj=longlat +datum=WGS84 +no_defs + 3452 + 4326 + EPSG:4326 + WGS 84 + longlat + EPSG:7030 + true - + + + + + + + + + - postgres + ogr @@ -1586,173 +1705,173 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + @@ -1762,360 +1881,341 @@ def my_form_open(dialog, layer, feature): + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + - + + + + + + + + + + + + - + - - - + + + - 0 0 - 0.7 - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + - + + + - + - + - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - + - @@ -2123,56 +2223,84 @@ def my_form_open(dialog, layer, feature): - . + 0 - . - + 0 generatedlayout - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "name" - + 51.87583829999999807 - 43.25484999999999758 + 43.33366199999999679 80.33710829999999703 54.22870559999999784 51.87583829999999807 - 43.25484999999999758 + 43.33366199999999679 80.33710829999999703 54.22870559999999784 - view_frmlocust_pods_density20170220095821682 - dbname='CCALM' host=ccalm.org port=5432 user='guest' password='B2C0D5C60590' sslmode=disable key='id' estimatedmetadata=true table="main"."view_frmlocust_pods_density" (geom) sql=${sql} + frmlocust_pods_density_bfae933f_2a09_41ef_8930_0fe505abb25d + /vsicurl/https://ccalm.org/api/locust/v01/geojson/frmlocust_pods_density?${params}|layername=frmlocust_pods_density?${params} - Плотность кубышек (/м²) + trt('Egg_pods_density_m2') GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],MEMBER["World Geodetic System 1984 (G2296)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] @@ -2190,35 +2318,52 @@ def my_form_open(dialog, layer, feature): - + dataset + + + + + + + + + - - - 0 - 0 - - - - - false + GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],MEMBER["World Geodetic System 1984 (G2296)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] + +proj=longlat +datum=WGS84 +no_defs + 3452 + 4326 + EPSG:4326 + WGS 84 + longlat + EPSG:7030 + true - + + + + + + + + + - postgres + ogr - - + + @@ -2228,300 +2373,300 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - - - - - - + + + + + + - + - + - + - + - + - + - + - + @@ -2529,599 +2674,82 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - + + + + + + + 0 0 1 - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -3129,372 +2757,38 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - @@ -3505,7 +2799,7 @@ def my_form_open(dialog, layer, feature): 0 - C:/Users/IVANOV~1.IST/AppData/Local/Temp + 0 generatedlayout - - - + + + + + + + + + + + + - COALESCE( "terrain", '<NULL>' ) - name + "pods" + - - - - + + + + @@ -3596,9 +2899,9 @@ def my_form_open(dialog, layer, feature): @@ -3624,7 +2927,7 @@ def my_form_open(dialog, layer, feature): - + PROJCRS["WGS 84 / Pseudo-Mercator",BASEGEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],MEMBER["World Geodetic System 1984 (G2296)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],ID["EPSG",4326]],CONVERSION["Popular Visualisation Pseudo-Mercator",METHOD["Popular Visualisation Pseudo Mercator",ID["EPSG",1024]],PARAMETER["Latitude of natural origin",0,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8801]],PARAMETER["Longitude of natural origin",0,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8802]],PARAMETER["False easting",0,LENGTHUNIT["metre",1],ID["EPSG",8806]],PARAMETER["False northing",0,LENGTHUNIT["metre",1],ID["EPSG",8807]]],CS[Cartesian,2],AXIS["easting (X)",east,ORDER[1],LENGTHUNIT["metre",1]],AXIS["northing (Y)",north,ORDER[2],LENGTHUNIT["metre",1]],USAGE[SCOPE["Web mapping and visualisation."],AREA["World between 85.06°S and 85.06°N."],BBOX[-85.06,-180,85.06,180]],ID["EPSG",3857]] +proj=merc +a=6378137 +b=6378137 +lat_ts=0 +lon_0=0 +x_0=0 +y_0=0 +k=1 +units=m +nadgrids=@null +wktext +no_defs @@ -3638,41 +2941,41 @@ def my_form_open(dialog, layer, feature): - + - + - + @@ -3689,7 +2992,7 @@ def my_form_open(dialog, layer, feature): - + - \ No newline at end of file +