From 95b5feee27f1df93ca4a9f42f99ca204f255f5e4 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Fri, 6 May 2022 11:57:04 -0500 Subject: [PATCH 1/3] [bbox & locations] adding new bbox and locations --- CMakeLists.txt | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ded537a9..3200238a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,25 +49,26 @@ option(PGR_WORKSHOP_VERBOSE_DEBUG #--------------------------------------------- # CONFIGURATION #--------------------------------------------- -set(PGR_WORKSHOP_CITY "Buenos Aires") -set(PGR_WORKSHOP_CITY_FILE "BA_AR") -set(PGR_WORKSHOP_CITY_BBOX "-58.48,-34.60,-58.32,-34.521") -set(PGR_WORKSHOP_LITTLE_NET_BBOX "-58.41,-34.58,-58.37,-34.55") -set(PGR_WORKSHOP_DOWNLOAD_DIR "workshop-2021") -set(DATE_OF_DATA "August 2020") - -set(OSMID_1 "192903446") -set(OSMID_2 "4289340366") -set(OSMID_3 "2153015792") -set(OSMID_4 "6357258588") -set(OSMID_5 "196017392") - - -set(PLACE_1 "Plaza Intendente Alvear") -set(PLACE_2 "Hard Rock Café") -set(PLACE_3 "Facultad de Derecho") -set(PLACE_4 "Centro de Convenciones Buenos Aires") -set(PLACE_5 "Palacio Duhau-Park Hyatt Buenos Aires") +set(PGR_WORKSHOP_CITY "Firenze") +set(PGR_WORKSHOP_CITY_FILE "FLORENCE_IT") +set(PGR_WORKSHOP_CITY_BBOX "11.20,43.76,11.27,43.79") +# TODO define little net BBOX +set(PGR_WORKSHOP_LITTLE_NET_BBOX "11.20,43.76,11.27,43.79") +set(PGR_WORKSHOP_DOWNLOAD_DIR "workshop-2022") +set(DATE_OF_DATA "July 2021") + +set(OSMID_1 "5020458299") +set(OSMID_2 "1798374718") +set(OSMID_3 "266939565") +set(OSMID_4 "2531656518") +set(OSMID_5 "6483155124") + + +set(PLACE_1 "Palazzo dei Congressi") +set(PLACE_2 "Cattedrale di Santa Maria del Fiore") +set(PLACE_3 "Mercato Centrale") +set(PLACE_4 "Stazione di Santa Maria Novella") +set(PLACE_5 "Hotel Albani") #TODO set points that are routable on chapter 8 From b6863ef7c14f7e257376efa5b04a234911310504 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Fri, 6 May 2022 12:09:25 -0500 Subject: [PATCH 2/3] [bbox & locations] adding new bbox and locations --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3200238a1..6a0bb5259 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,8 +20,8 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") #--------------------------------------------- # Setting the version number #--------------------------------------------- -set(WORKSHOP_AREA "FOSS4G Argentina") -set(COPYRIGHT "2010-2021 Daniel Kastl, Vicky Vergara") +set(WORKSHOP_AREA "FOSS4G Italy") +set(COPYRIGHT "2010-2021 Daniel Kastl, Vicky Vergara, Rajat Shinde") set(PGR_WORKSHOP_VERSION_MAJOR "2") set(PGR_WORKSHOP_VERSION_MINOR "7") set(PGR_WORKSHOP_VERSION_PATCH "0") @@ -50,7 +50,7 @@ option(PGR_WORKSHOP_VERBOSE_DEBUG # CONFIGURATION #--------------------------------------------- set(PGR_WORKSHOP_CITY "Firenze") -set(PGR_WORKSHOP_CITY_FILE "FLORENCE_IT") +set(PGR_WORKSHOP_CITY_FILE "Firenze_IT") set(PGR_WORKSHOP_CITY_BBOX "11.20,43.76,11.27,43.79") # TODO define little net BBOX set(PGR_WORKSHOP_LITTLE_NET_BBOX "11.20,43.76,11.27,43.79") From 58d3d87790f14e0fe5395cdb7c673eee323ebcf2 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Fri, 6 May 2022 12:09:58 -0500 Subject: [PATCH 3/3] [data] getting data from osgeolive backup location --- docs/scripts/get_data/get_osgeolive_data.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/scripts/get_data/get_osgeolive_data.sh b/docs/scripts/get_data/get_osgeolive_data.sh index 3a01689e2..6cf177470 100755 --- a/docs/scripts/get_data/get_osgeolive_data.sh +++ b/docs/scripts/get_data/get_osgeolive_data.sh @@ -2,9 +2,10 @@ set -e # 4.2.2 from-here +# TODO Use the /15/osm instead of data/osm/FIRENZE_IT CITY="@PGR_WORKSHOP_CITY_FILE@" wget -N --progress=dot:mega \ -"http://download.osgeo.org/livedvd/14/osm/$CITY.osm.bz2" +"http://download.osgeo.org/livedvd/data/osm/FIRENZE_IT/$CITY.osm.bz2" bunzip2 -f "$CITY.osm.bz2" # 4.2.2 to-here