Compare commits

...

80 Commits
2018 ... master

Author SHA1 Message Date
Timothy Allen e82cf4ce26 Update scripts 2023-09-15 10:02:53 +02:00
Timothy Allen 621c8842b1 Update marshal position data 2023-09-14 23:12:16 +02:00
Timothy Allen 11e30aa5ff Update marshal descriptions 2023-09-14 17:05:26 +02:00
Timothy Allen ba0984559c Minor marshal renumber 2023-09-11 20:51:08 +02:00
Timothy Allen be76828c31 Updates to routes, fencing and marshals 2023-09-11 14:43:09 +02:00
Timothy Allen 77810f78a7 Update fencing, and more minor route corrections 2023-09-07 23:15:21 +02:00
Timothy Allen 7039065725 Remove Fun Run, new 10KM route, and marshal updates 2023-09-07 12:34:32 +02:00
Timothy Allen d68b4f935f Update marshal plan extent for Saturday's 10KM 2023-09-02 20:14:07 +02:00
Timothy Allen fdd6a9b75a Update index creation script 2023-09-02 12:42:51 +02:00
Timothy Allen fa6e3ab3bb Change to routes, and update marshal positions and numbers 2023-09-02 11:51:05 +02:00
Timothy Allen d83220afe4 Split fun run and dog walk 2023-08-09 15:46:02 +02:00
Timothy Allen bc2b5edbf5 Update trail route 2023-07-08 16:34:25 +02:00
Timothy Allen 00df0666a0 2023: initial routes 2023-05-31 18:02:21 +02:00
Timothy Allen af06fe58fc Update for marshal maps 2022-09-16 09:13:08 +02:00
Timothy Allen 765d7692d7 Updates to marshals 2022-09-15 12:43:59 +02:00
Timothy Allen b890d99728 Update 5KM & Trail routes for new changes, along with fencing and marshal positions 2022-09-14 15:17:40 +02:00
Timothy Allen ad1839c0c3 Update for marshal positions 2022-09-13 14:40:00 +02:00
Timothy Allen 40136e361b More cone/fencing tweaks 2022-09-13 10:52:30 +02:00
Timothy Allen 0e0d6228ba Fix minor fencing error; add cone-specific map layout 2022-09-13 09:52:04 +02:00
Timothy Allen 714a321b35 Fix marshal plan outlines 2022-09-12 08:36:39 +02:00
Timothy Allen a628d4f224 Updates to fencing, and renumbering of marshals. 2022-09-11 23:08:13 +02:00
Timothy Allen 8f638d7eca Move some marshals around Queen's Circle 2022-09-08 19:44:43 +02:00
Timothy Allen ebb568739c Update 5KM marshals 2022-09-07 21:07:05 +02:00
Timothy Allen 0632311d53 Update trail route & marshals 2022-09-07 20:37:29 +02:00
Timothy Allen e85678aa38 Add fencing 2022-09-06 21:36:22 +02:00
Timothy Allen 199fabda72 Update routes and add water tables 2022-09-06 15:23:44 +02:00
Timothy Allen c41622c98f Changes to 5KM and Trail routes 2022-09-04 18:42:22 +02:00
Timothy Allen 33d2508ce4 Update routes 2022-08-30 11:56:54 +02:00
Timothy Allen 6bfdad7365 Add marshal positions and new logo 2022-08-28 15:21:36 +02:00
Timothy Allen 4551300820 Update route for Trail, along with tweaks to 5KM and 10KM; update marshal overview for two-day event 2022-08-19 13:46:41 +02:00
Timothy Allen dbe7e14d25 Fix roads and all routes layout 2022-07-27 13:14:33 +02:00
Timothy Allen 6d04aab3d8 Add trail run 2022-07-27 12:31:03 +02:00
Timothy Allen 2705c57c35 First route for 2022 2022-07-15 12:33:58 +02:00
Timothy Allen a5d706ba61 Update gitingore 2021-03-12 07:09:08 +02:00
Timothy Allen 5d57fa14b2 Update fencing maps with 2019 lessons learned.
Note there may be an issue with this GDAL CoCT tile XML file in GDAL 3.0, regarding the projection.
2019-12-04 19:43:29 +02:00
Timothy Allen 8c2af36944 Final updates for 2019. 2019-10-25 09:40:29 +02:00
Timothy Allen 9e68c64444 Final updates to fencing, routes, and some additional maps for the mayor and VIPs. 2019-10-20 21:50:51 +02:00
Timothy Allen 0156dab06d Significant updates to fencing. 2019-10-15 22:57:18 +02:00
Timothy Allen 78b9981d64 Initial run of marshal maps; golf course access and VIP parking maps. 2019-10-15 21:19:14 +02:00
Timothy Allen dcb11009ef Updates to map names. 2019-10-14 07:26:38 +02:00
Timothy Allen 353098292f Time lapse, and small fencing road name change. 2019-10-11 15:55:38 +02:00
Timothy Allen 7e37179834 Updates to fencing. 2019-10-11 13:40:42 +02:00
Timothy Allen 5de0582a98 Updates to ask me data. 2019-10-11 13:38:56 +02:00
Timothy Allen d328fea37a Add group labels to Finish SVG; update time lapse instructions. 2019-10-10 14:22:05 +02:00
Timothy Allen c3121d7217 Slight route changes & updates to fencing.wq 2019-10-10 09:50:47 +02:00
Timothy Allen 90610a47bc Don't keep track of powerpoint presentations (since they don't need to be in git) 2019-10-09 09:36:20 +02:00
Timothy Allen 48977eb0cf Updates to marshal spreadsheet and route description 2019-10-09 09:34:26 +02:00
Timothy Allen 9f47234f12 Race route description 2019-10-09 09:32:47 +02:00
Timothy Allen 06e679e9e3 Updates to QGIS files; includes initial attempt at creating automatic route markers via all_routes labels, a geometry generator, and a python script. 2019-10-09 09:31:32 +02:00
Timothy Allen 7a9f08692e Updates to Start map. 2019-10-09 09:30:45 +02:00
Timothy Allen bafbe24f03 Updates to marshal positions. 2019-10-09 09:30:45 +02:00
Timothy Allen 2660579f16 Updates to fencing 2019-10-09 09:30:44 +02:00
Timothy Allen 263ae40986 Final (let's hope!) routes. 2019-10-09 09:30:44 +02:00
Timothy Allen 440e60b8d5 Updates to confirmed route (just waiting for route measurements now), along with fencing modifications; slight change to residents map. 2019-10-08 09:27:11 +02:00
Timothy Allen 1654469cb8 Update to time lapse video 2019-10-08 00:20:48 +02:00
Timothy Allen 3a5beb8cbf Updates to proposed 21KM route to use Chiappini; 10KM to remove turnaround after Underpass; and to fencing for both routes. 2019-10-07 23:36:20 +02:00
Timothy Allen 1137696d31 Add fencing map. 2019-10-07 14:12:59 +02:00
Timothy Allen 89c6791e4d Updates to fencing, start maps, and residents access. Beginnings of route changes. 2019-10-07 14:09:51 +02:00
Timothy Allen 8ef546e7d0 Update to proposed routes; add new A1 marshal plan layout. 2019-10-04 15:47:42 +02:00
Timothy Allen 8910855b07 Updates to proposed 21KM route to avoid Underpass and keep Granger Bay Blvd open. 2019-10-02 20:28:48 +02:00
Timothy Allen 84c0b93071 Corrections to route marker style; addition of proposed route as a new (alternate) shapefile, for testing changes. 2019-10-02 18:26:14 +02:00
Timothy Allen 28971c619c Updated route overlay; moved Gun Run logo into working tree. 2019-10-02 14:22:28 +02:00
Timothy Allen b2db42a3a8 Updated start/finish area; moved timelapse out of mldata into a shapefile to reduce save times; created an overlay with all routes on. 2019-10-01 21:47:03 +02:00
Timothy Allen bfd9da58e1 Updates to route lengths. 2019-10-01 16:39:17 +02:00
Timothy Allen 3fb39a3d2a First pass at fencing. 2019-10-01 16:34:15 +02:00
Timothy Allen cdf6093278 Route changes: move starts; reverse early 21 loop; correct underpass and Somerset paths. 2019-10-01 14:26:06 +02:00
Timothy Allen a643640385 Changes to finish layout 2019-09-26 16:48:57 +02:00
Timothy Allen 1f8d286789 Updates to water table positions; stage and vendor corrections to finish map; addition of time lapses. 2019-09-24 21:28:27 +02:00
Timothy Allen 1ebd5db2e5 Water table corrects, unbranded version of finish map, and corrected start times on time lapse. 2019-09-21 01:04:01 +02:00
Timothy Allen 8eef2c2409 Water table update and slight route correction 2019-09-19 12:19:40 +02:00
Timothy Allen 0bd8abc6b3 Updated for 21KM turnaround. 2019-09-19 11:42:34 +02:00
Timothy Allen 8b93b35ccb Latest changes for Helen Suzman route 2019-09-19 10:48:36 +02:00
Timothy Allen d32f64797e More cleanups. 2019-09-10 22:34:41 +02:00
Timothy Allen 29970f6970 Move modified files from 2018 to correct locations. 2019-09-10 22:19:43 +02:00
Timothy Allen a1dc0ca83b Latest route changes 2019-09-10 22:09:46 +02:00
Timothy Allen 8fb818690c Update to routes. 2019-09-10 17:41:30 +02:00
Timothy Allen de4478014d Small file updates. 2019-09-10 15:48:55 +02:00
Timothy Allen 7f47c0cba8 First version of 2019 routes. 2019-09-10 15:46:15 +02:00
Timothy Allen 6c127bbb6e Changes to finish (branding). 2019-09-03 09:40:09 +02:00
Timothy Allen 3460d84b4d 2019: Clean up 2019-09-01 11:56:58 +02:00
542 changed files with 56467 additions and 37788 deletions

7
.gitignore vendored
View File

@ -1,10 +1,17 @@
#*/**/*.pdf
#*/**/*.png
#*/**/*.jpg
*.pptx
**/Marshals/*.pdf
**/Marshals/*.png
**/Original/*.pdf
**/Originals/*.pdf
**/Orig/*.pdf
gdalwmscache/**
**/gdalwmscache/**
**/Time Lapse/*.png
**/Time Lapse/*.pgw
*.xls
*.xlsx
*.csv
password_store

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 2.2 MiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 16 MiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 30 MiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,9 +1,7 @@
<GDAL_WMS>
<Service name="TMS">
<ServerUrl>http://b.coct.aerial.openstreetmap.org.za/layer/za_coct_aerial_2015/${z}/${x}/${y}.jpg</ServerUrl>
</Service>
<DataWindow>
<UpperLeftX>-20037508.34</UpperLeftX>
<UpperLeftY>20037508.34</UpperLeftY>

View File

@ -0,0 +1,13 @@
To add the outline map layer:
In QGIS, go to the Layer menu option, select Data Source Manager, and, in the left panel, choose WMS/WMTS.
Make sure the Layers tab is selected, and click the New button. This will open a new dialogue box.
Give the map a name ("Tim's Custom Mapbox Outline" or something similar -- adding my name is so you know who to bug if it stops working).
Set the URL to: https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token=pk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNqdHpzOGh2ZjFtNWQ0ZnBsYmNlZXpoNGQifQ.TQX0oaw1nv2g6lHeCmSVwg
Click on OK to close the dialogue box. Then, next to the "New" button, click on "Connect". (If anything goes wrong, send me the error message that will appear here.) If everything goes right, it'll switch to the Tileset tab, with a highlighted layer. At the bottom, it will allow you to change the map name, if you like. Below this, click on "Add".
You should now have a new layer with the right outlines.

BIN
GIS Base Map/Gun Run.qgd Normal file

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More