Mike Simpson
269ec45834
Merge pull request #1135 from colouring-cities/tweaks/land-use-key
...
Update Land Use Key
2023-04-14 12:57:52 +01:00
Mike Simpson
24705ece30
Update Land Use Key
...
Change order and rename "Domestic Building" option
2023-04-14 12:57:09 +01:00
Mike Simpson
8d15cf8adf
Merge branch 'colouring-core'
2023-04-13 21:17:22 +01:00
Mike Simpson
a5c7e223dc
Update cc-config.json
2023-04-13 21:16:46 +01:00
Mike Simpson
6dd8bed440
Merge branch 'master' into master
2023-04-13 15:00:08 +01:00
Mike Simpson
91d9f5b697
Merge pull request #1133 from colouring-cities/ui/change-welcome-text
...
Tweaks to Welcome Text
2023-04-13 09:58:30 +01:00
Mike Simpson
0c3562e9fd
Tweaks to Welcome Text
...
As requested by Polly
#1116
2023-04-12 22:04:36 +01:00
Mike Simpson
95b016ba24
Merge pull request #1132 from colouring-cities/dependabot/npm_and_yarn/app/follow-redirects-1.15.2
...
Bump follow-redirects from 1.14.7 to 1.15.2 in /app
2023-04-12 21:50:28 +01:00
dependabot[bot]
7432dbf1ed
Bump follow-redirects from 1.14.7 to 1.15.2 in /app
...
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects ) from 1.14.7 to 1.15.2.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases )
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.15.2 )
---
updated-dependencies:
- dependency-name: follow-redirects
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-04-12 20:23:09 +00:00
Mike Simpson
d0c9806775
Merge pull request #1125 from colouring-cities/dependabot/npm_and_yarn/app/webpack-5.76.0
...
Bump webpack from 5.24.0 to 5.76.0 in /app
2023-04-12 21:22:38 +01:00
Mike Simpson
0b9c8dbe2c
Merge pull request #1123 from colouring-cities/dependabot/npm_and_yarn/app/url-parse-1.5.10
...
Bump url-parse from 1.5.4 to 1.5.10 in /app
2023-04-12 21:22:26 +01:00
Mike Simpson
67d1442206
Merge branch 'colouring-cities:master' into master
2023-04-06 15:51:45 +01:00
Mike Simpson
26a0514f32
Merge pull request #1128 from colouring-cities/feature/survival-status
...
Feature/survival status
2023-04-06 15:51:30 +01:00
Mike Simpson
f0d6d28169
Add Survival Status migrations
2023-04-06 15:43:55 +01:00
Mike Simpson
90af39dfaf
Update historic maps to show Survival Status
2023-04-06 15:22:15 +01:00
Mike Simpson
07cb6b4846
Add Survival Source
2023-04-06 15:21:59 +01:00
Mike Simpson
d92456cdae
Big Fix for Survival Status on some buildings
2023-04-06 15:21:41 +01:00
Mike Simpson
8418b5f6c0
WIP - Survival Status data saving
...
Activate Survival Status drop down box on Age and History category. Allow it to be set, saved and visualised.
2023-04-05 15:13:48 +01:00
dependabot[bot]
a468cd12e2
Bump webpack from 5.24.0 to 5.76.0 in /app
...
Bumps [webpack](https://github.com/webpack/webpack ) from 5.24.0 to 5.76.0.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v5.24.0...v5.76.0 )
---
updated-dependencies:
- dependency-name: webpack
dependency-type: direct:development
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-03-14 15:24:15 +00:00
dependabot[bot]
49eca09d51
Bump url-parse from 1.5.4 to 1.5.10 in /app
...
Bumps [url-parse](https://github.com/unshiftio/url-parse ) from 1.5.4 to 1.5.10.
- [Release notes](https://github.com/unshiftio/url-parse/releases )
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.4...1.5.10 )
---
updated-dependencies:
- dependency-name: url-parse
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-03-10 16:42:49 +00:00
Mike Simpson
ecb8f6b262
Merge pull request #1122 from colouring-cities/dependabot/npm_and_yarn/app/ansi-regex-5.0.1
...
Bump ansi-regex from 4.1.0 to 5.0.1 in /app
2023-03-10 16:42:12 +00:00
dependabot[bot]
233c4ef277
Bump ansi-regex from 4.1.0 to 5.0.1 in /app
...
Bumps [ansi-regex](https://github.com/chalk/ansi-regex ) from 4.1.0 to 5.0.1.
- [Release notes](https://github.com/chalk/ansi-regex/releases )
- [Commits](https://github.com/chalk/ansi-regex/compare/v4.1.0...v5.0.1 )
---
updated-dependencies:
- dependency-name: ansi-regex
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-03-10 16:40:36 +00:00
Mike Simpson
b34b1bdae4
Merge pull request #1118 from colouring-cities/dependabot/npm_and_yarn/app/async-2.6.4
...
Bump async from 2.6.3 to 2.6.4 in /app
2023-03-10 16:39:36 +00:00
Mike Simpson
2892dae4bc
Merge pull request #1121 from colouring-cities/dependabot/npm_and_yarn/app/sharp-0.30.5
...
Bump sharp from 0.28.3 to 0.30.5 in /app
2023-03-10 16:39:28 +00:00
Mike Simpson
6fc902ae12
Merge pull request #1120 from colouring-cities/dependabot/npm_and_yarn/app/eventsource-1.1.2
...
Bump eventsource from 1.1.0 to 1.1.2 in /app
2023-03-10 16:39:14 +00:00
Mike Simpson
fa18db2882
Merge pull request #1119 from colouring-cities/dependabot/npm_and_yarn/app/terser-4.8.1
...
Bump terser from 4.8.0 to 4.8.1 in /app
2023-03-10 16:38:29 +00:00
dependabot[bot]
e9cf78d583
Bump sharp from 0.28.3 to 0.30.5 in /app
...
Bumps [sharp](https://github.com/lovell/sharp ) from 0.28.3 to 0.30.5.
- [Release notes](https://github.com/lovell/sharp/releases )
- [Changelog](https://github.com/lovell/sharp/blob/main/docs/changelog.md )
- [Commits](https://github.com/lovell/sharp/compare/v0.28.3...v0.30.5 )
---
updated-dependencies:
- dependency-name: sharp
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-03-10 16:34:46 +00:00
dependabot[bot]
f8ff1bb63c
Bump eventsource from 1.1.0 to 1.1.2 in /app
...
Bumps [eventsource](https://github.com/EventSource/eventsource ) from 1.1.0 to 1.1.2.
- [Release notes](https://github.com/EventSource/eventsource/releases )
- [Changelog](https://github.com/EventSource/eventsource/blob/master/HISTORY.md )
- [Commits](https://github.com/EventSource/eventsource/compare/v1.1.0...v1.1.2 )
---
updated-dependencies:
- dependency-name: eventsource
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-03-10 16:34:38 +00:00
dependabot[bot]
aca897cfe5
Bump terser from 4.8.0 to 4.8.1 in /app
...
Bumps [terser](https://github.com/terser/terser ) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/terser/terser/releases )
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md )
- [Commits](https://github.com/terser/terser/compare/v4.8.0...v4.8.1 )
---
updated-dependencies:
- dependency-name: terser
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-03-10 16:34:32 +00:00
dependabot[bot]
2283bbb96a
Bump async from 2.6.3 to 2.6.4 in /app
...
Bumps [async](https://github.com/caolan/async ) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases )
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md )
- [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4 )
---
updated-dependencies:
- dependency-name: async
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-03-10 16:34:28 +00:00
Mike Simpson
7aa106624d
Merge pull request #1108 from colouring-cities/dependabot/npm_and_yarn/app/json5-1.0.2
...
Bump json5 from 1.0.1 to 1.0.2 in /app
2023-03-10 16:33:59 +00:00
Mike Simpson
75dc274251
Merge pull request #1109 from colouring-cities/dependabot/npm_and_yarn/app/qs-and-body-parser-and-express-6.11.0
...
Bump qs, body-parser and express in /app
2023-03-10 16:33:49 +00:00
Mike Simpson
484a0f0c82
Merge pull request #1110 from colouring-cities/dependabot/npm_and_yarn/app/decode-uri-component-0.2.2
...
Bump decode-uri-component from 0.2.0 to 0.2.2 in /app
2023-03-10 16:33:44 +00:00
Mike Simpson
a9b70788da
Merge pull request #1111 from colouring-cities/dependabot/npm_and_yarn/app/loader-utils-1.4.2
...
Bump loader-utils from 1.4.0 to 1.4.2 in /app
2023-03-10 16:33:37 +00:00
Mike Simpson
ec7a515e8b
Merge pull request #1113 from colouring-cities/dependabot/npm_and_yarn/app/minimist-1.2.8
...
Bump minimist from 1.2.5 to 1.2.8 in /app
2023-03-10 16:33:32 +00:00
Mike Simpson
a8e8de65f7
Update README.md
2023-03-10 16:24:33 +00:00
Mike Simpson
1df5e87aa7
Update README.md
2023-03-10 16:23:49 +00:00
Mike Simpson
91e871ff27
Update working-with-colouring-core.md
2023-03-10 16:19:54 +00:00
Mike Simpson
facd81c74a
Update README.md
2023-03-10 11:43:10 +00:00
traveller195
4dcd3de93a
change data definiton for tile mapstyle of 'location' and 'team'
...
using Subquery/ nested SQL Qquery to only load those buildings, having at least a few collected data. The benefit is, that the mapstyle is not different for nodata buildings comparing different data categories. Now, if you compare nodata buildings in 'team' or 'location' with others, the stroke width is larger than the normal map style... loading only builidings with data avoids this problem of different map styles. It is a better and more performant solution than changing it in polygon.xml
see also c80f243c0d
2023-03-08 15:30:39 +01:00
dependabot[bot]
52f06fe896
Bump minimist from 1.2.5 to 1.2.8 in /app
...
Bumps [minimist](https://github.com/minimistjs/minimist ) from 1.2.5 to 1.2.8.
- [Release notes](https://github.com/minimistjs/minimist/releases )
- [Changelog](https://github.com/minimistjs/minimist/blob/main/CHANGELOG.md )
- [Commits](https://github.com/minimistjs/minimist/compare/v1.2.5...v1.2.8 )
---
updated-dependencies:
- dependency-name: minimist
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-03-04 02:50:10 +00:00
dependabot[bot]
507a61faf3
Bump loader-utils from 1.4.0 to 1.4.2 in /app
...
Bumps [loader-utils](https://github.com/webpack/loader-utils ) from 1.4.0 to 1.4.2.
- [Release notes](https://github.com/webpack/loader-utils/releases )
- [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.2/CHANGELOG.md )
- [Commits](https://github.com/webpack/loader-utils/compare/v1.4.0...v1.4.2 )
---
updated-dependencies:
- dependency-name: loader-utils
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-02-28 11:56:00 +00:00
dependabot[bot]
30a16632ba
Bump qs, body-parser and express in /app
...
Bumps [qs](https://github.com/ljharb/qs ) to 6.11.0 and updates ancestor dependencies [qs](https://github.com/ljharb/qs ), [body-parser](https://github.com/expressjs/body-parser ) and [express](https://github.com/expressjs/express ). These dependencies need to be updated together.
Updates `qs` from 6.9.6 to 6.11.0
- [Release notes](https://github.com/ljharb/qs/releases )
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md )
- [Commits](https://github.com/ljharb/qs/compare/v6.9.6...v6.11.0 )
Updates `body-parser` from 1.19.1 to 1.20.1
- [Release notes](https://github.com/expressjs/body-parser/releases )
- [Changelog](https://github.com/expressjs/body-parser/blob/master/HISTORY.md )
- [Commits](https://github.com/expressjs/body-parser/compare/1.19.1...1.20.1 )
Updates `express` from 4.17.2 to 4.18.2
- [Release notes](https://github.com/expressjs/express/releases )
- [Changelog](https://github.com/expressjs/express/blob/master/History.md )
- [Commits](https://github.com/expressjs/express/compare/4.17.2...4.18.2 )
---
updated-dependencies:
- dependency-name: qs
dependency-type: indirect
- dependency-name: body-parser
dependency-type: direct:production
- dependency-name: express
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-02-28 11:55:59 +00:00
dependabot[bot]
e8ffd5ef3c
Bump decode-uri-component from 0.2.0 to 0.2.2 in /app
...
Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component ) from 0.2.0 to 0.2.2.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases )
- [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2 )
---
updated-dependencies:
- dependency-name: decode-uri-component
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-02-28 11:55:59 +00:00
dependabot[bot]
5e42236ee2
Bump json5 from 1.0.1 to 1.0.2 in /app
...
Bumps [json5](https://github.com/json5/json5 ) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/json5/json5/releases )
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md )
- [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2 )
---
updated-dependencies:
- dependency-name: json5
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-02-28 11:55:46 +00:00
Mike Simpson
d1d1e00cc2
Rename working-with-colouring-core to working-with-colouring-core.md
2023-02-27 15:13:09 +00:00
Mike Simpson
6fa06431b8
Create working-with-colouring-core
2023-02-27 15:12:38 +00:00
Mike Simpson
71f7137fcd
Merge pull request #1103 from matkoniecz/patch-1
...
describe planning data script in context of core
2023-02-24 10:02:45 +00:00
Mike Simpson
2f21ef0020
Merge pull request #1098 from colouring-cities/tweaks/ui
...
Rename Size and Form Category
2023-02-24 09:45:33 +00:00
Mateusz Konieczny
9892ddd386
describe planning data script in context of core
2023-02-19 07:36:37 +01:00