612 Commits

Author SHA1 Message Date
louis-e
7a42f011de Fix fmt 2025-05-05 00:25:25 +02:00
louis-e
106214c8ea WIP: Add subway 2025-05-05 00:21:58 +02:00
Louis Erbkamm
922e752684 Merge pull request #425 from GMart/Update-block-types
Update leisure and highway element processing
2025-05-03 16:37:09 +02:00
Garrett M
873f6aa995 Merge branch 'louis-e:main' into Update-block-types 2025-05-02 11:17:34 -04:00
Garrett M
0cd4c0e28d Add comments and dirt block option
Add comments to code, add dirt to option for dog park, playground, etc.
2025-05-02 11:16:44 -04:00
Garrett M
97eebbb977 Fixes for stairs and unneeded tag
In Leisure, soccer golf is used less than 1000 time worldwide. Removed since it will rarely be used.
in highways, changes stairs to be GRAY_CONCRETE for now, until they are properly added.
2025-05-02 11:06:59 -04:00
Louis Erbkamm
7ae6dc8143 Merge pull request #430 from Oleg4260/main
Implement wetlands
2025-05-02 17:04:52 +02:00
Oleg4260
a112cda485 Merge branch 'louis-e:main' into main 2025-05-02 12:44:40 +03:00
Garrett M
116f753e45 Merge branch 'louis-e:main' into Update-block-types 2025-05-01 18:36:46 -04:00
Louis Erbkamm
3c41be1ad0 Merge pull request #416 from benjamin051000/separate-gui-logic
Move GUI logic to its own file
2025-05-01 23:51:39 +02:00
Louis Erbkamm
7ad15c70c3 main.rs: fix fmt 2025-05-01 23:03:47 +02:00
Louis Erbkamm
bf53f4bb2f gui.rs: fix fmt 2025-05-01 23:01:15 +02:00
Louis Erbkamm
be819c01a0 Update gui.rs with latest changes 2025-05-01 22:59:47 +02:00
Louis Erbkamm
899cb2ee16 Merge branch 'main' into separate-gui-logic 2025-05-01 22:58:49 +02:00
Louis Erbkamm
b63b3ae05a pr-benchmark.yml: add memory annotation 2025-05-01 22:01:07 +02:00
Oleg4260
48c2e93292 Merge branch 'main' into main 2025-05-01 18:34:58 +03:00
Garrett M
4395eb6dd6 Merge branch 'louis-e:main' into Update-block-types 2025-05-01 09:11:31 -04:00
Louis Erbkamm
e8bbbec0f9 pr-benchmark.yml: add more stats 2025-05-01 15:07:07 +02:00
Garrett M
b16c0f84ac Merge branch 'louis-e:main' into Update-block-types 2025-05-01 09:03:48 -04:00
Louis Erbkamm
6efee57cbc pr-benchmark.yml: fix reference time 2025-05-01 14:52:10 +02:00
Louis Erbkamm
41ae099887 pr-benchmark.yml: enable terrain 2025-05-01 14:46:58 +02:00
Louis Erbkamm
781bb79ae5 Merge pull request #434 from louis-e/dependabot/cargo/once_cell-1.21.3
Bump once_cell from 1.20.2 to 1.21.3
2025-05-01 14:40:27 +02:00
Louis Erbkamm
3b378296a3 Merge pull request #433 from louis-e/dependabot/cargo/windows-0.61.1
Bump windows from 0.59.0 to 0.61.1
2025-05-01 14:40:15 +02:00
Louis Erbkamm
703b83a2fd Merge pull request #432 from louis-e/dependabot/cargo/colored-3.0.0
Bump colored from 2.2.0 to 3.0.0
2025-05-01 14:39:49 +02:00
Louis Erbkamm
c7e1b5bf67 Merge pull request #431 from louis-e/dependabot/cargo/flate2-1.1.1
Bump flate2 from 1.0.35 to 1.1.1
2025-05-01 14:39:40 +02:00
Garrett M
b8f45ac178 Merge branch 'louis-e:main' into Update-block-types 2025-05-01 08:34:10 -04:00
Louis Erbkamm
e9133c136a pr-benchmark.yml: fix reference time 2025-05-01 14:23:40 +02:00
Louis Erbkamm
92881cf3b3 pr-benchmark.yml: fix new line 2025-05-01 14:19:42 +02:00
Louis Erbkamm
421fe47ecf pr-benchmark.yml: fix summary 2025-05-01 14:13:55 +02:00
Louis Erbkamm
0c2c99544e pr-benchmark.yml: fix summary 2025-05-01 14:12:22 +02:00
Louis Erbkamm
491716f0fc pr-benchmark.yml: fix summary 2025-05-01 14:10:48 +02:00
Louis Erbkamm
96f9bc736e pr-benchmark.yml: more detailed comment 2025-05-01 14:05:38 +02:00
Louis Erbkamm
ffe694f9d8 pr-benchmark.yml: add detailed comment 2025-05-01 14:00:34 +02:00
Louis Erbkamm
c7b6df92ab Update pr-benchmark.yml 2025-05-01 13:53:13 +02:00
Louis Erbkamm
5b67f8ee84 pr-benchmark.yml: update bbox arg input 2025-05-01 13:49:52 +02:00
Louis Erbkamm
179cb6fa2d pr-benchmark.yml: Create dummy world 2025-05-01 13:46:00 +02:00
Louis Erbkamm
15c8265a21 pr-benchmark.yml: run on command 2025-05-01 13:40:27 +02:00
Louis Erbkamm
7ec0b9aa03 Run pr-benchmark.yml on opened PR 2025-05-01 13:33:51 +02:00
dependabot[bot]
c1ac1774fb Bump once_cell from 1.20.2 to 1.21.3
Bumps [once_cell](https://github.com/matklad/once_cell) from 1.20.2 to 1.21.3.
- [Changelog](https://github.com/matklad/once_cell/blob/master/CHANGELOG.md)
- [Commits](https://github.com/matklad/once_cell/compare/v1.20.2...v1.21.3)

---
updated-dependencies:
- dependency-name: once_cell
  dependency-version: 1.21.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-05-01 02:14:14 +00:00
dependabot[bot]
b46cd17ff4 Bump windows from 0.59.0 to 0.61.1
Bumps [windows](https://github.com/microsoft/windows-rs) from 0.59.0 to 0.61.1.
- [Release notes](https://github.com/microsoft/windows-rs/releases)
- [Commits](https://github.com/microsoft/windows-rs/commits)

---
updated-dependencies:
- dependency-name: windows
  dependency-version: 0.61.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-05-01 02:13:54 +00:00
dependabot[bot]
2789a40fd0 Bump colored from 2.2.0 to 3.0.0
Bumps [colored](https://github.com/mackwic/colored) from 2.2.0 to 3.0.0.
- [Release notes](https://github.com/mackwic/colored/releases)
- [Changelog](https://github.com/colored-rs/colored/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mackwic/colored/compare/v2.2.0...v3.0.0)

---
updated-dependencies:
- dependency-name: colored
  dependency-version: 3.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-05-01 02:13:40 +00:00
dependabot[bot]
6f71bc3fdb Bump flate2 from 1.0.35 to 1.1.1
Bumps [flate2](https://github.com/rust-lang/flate2-rs) from 1.0.35 to 1.1.1.
- [Release notes](https://github.com/rust-lang/flate2-rs/releases)
- [Commits](https://github.com/rust-lang/flate2-rs/compare/1.0.35...1.1.1)

---
updated-dependencies:
- dependency-name: flate2
  dependency-version: 1.1.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-05-01 02:13:26 +00:00
Garrett M
7a102dec51 Fix extra match and typo
Fix GRASS to GRASS_BLOCK
Remove ladder type as it would have to have special properties to work properly
2025-04-30 19:24:39 -04:00
Oleg4260
320acac80d More wetland types 2025-04-30 17:33:53 +03:00
Oleg4260
0cad9fa307 fix forest generating over roads 2025-04-30 16:41:18 +03:00
Garrett M
b03202ac71 Update leisure.rs
Fix nature_reserve
Add more leisure values.
2025-04-29 14:11:01 -04:00
Oleg4260
32ae0778e2 Implement wetlands
Implement wetlands

cargo fmt; implement bog

Better bog
2025-04-29 20:49:16 +03:00
Garrett M
faef164abe Fix marina and add more blocks to highways.rs
Remove marina from water. It was making entire marina areas water, which was not intended. Add some block types to highways
2025-04-28 23:39:04 -04:00
Garrett M
d9930c2b44 Merge branch 'louis-e:main' into Update-block-types 2025-04-28 17:35:38 -04:00
Louis Erbkamm
1a0fc291b0 Merge pull request #426 from Oleg4260/main
Fixes for pull/423
2025-04-28 21:21:40 +02:00
Oleg4260
bb14b1da49 fix fmt 2025-04-28 12:55:10 +03:00
Oleg4260
c0edbaa92c cargo fmt 2025-04-28 12:48:49 +03:00
Oleg4260
bf69996427 Fix crash caused by unicode characters in area_name 2025-04-28 12:45:34 +03:00
Oleg4260
1c734cdd7c Fix generation of ground layers, remove unnecessary function 2025-04-28 12:10:57 +03:00
Garrett M
ed529071ae Merge branch 'louis-e:main' into Update-block-types 2025-04-27 21:08:27 -04:00
Louis Erbkamm
9a288e3966 Merge pull request #423 from louis-e/simplify-elevation
Simplify elevation retrieval in each element processor
2025-04-27 23:48:54 +02:00
louis-e
e5f0717838 Fix bedrock layer 2025-04-27 23:39:08 +02:00
louis-e
c258892b45 Fix cargo fmt 2025-04-27 23:23:37 +02:00
louis-e
151ced7625 Assign persistent property to birch leaves 2025-04-27 23:21:38 +02:00
louis-e
73e8bab4a0 Resolve merge conflicts 2025-04-27 23:18:12 +02:00
Garrett M
3dfa2ca62e leisure.rs cargo fmt
Cargo fmt
2025-04-27 16:48:30 -04:00
Louis Erbkamm
f1d3c0b980 Merge pull request #421 from Oleg4260/main
Optimize ground generation + new natural elements
2025-04-27 22:36:52 +02:00
louis-e
bcc986969f Merge branch 'simplify-elevation' of https://github.com/louis-e/arnis into simplify-elevation 2025-04-27 22:28:35 +02:00
Louis Erbkamm
2d07e9c2b9 Fix cargo fmt 2025-04-27 22:27:11 +02:00
Louis Erbkamm
a213bace19 Fix clippy 2025-04-27 22:18:50 +02:00
Louis Erbkamm
7552a99a34 Fix clippy 2025-04-27 22:16:28 +02:00
Louis Erbkamm
ec3f5825b4 Fix formatting 2025-04-27 22:08:09 +02:00
louis-e
1294c3ef3c Fix formatting for CI 2025-04-27 22:06:52 +02:00
Louis Erbkamm
ca2fd0b1c6 Merge branch 'main' into simplify-elevation 2025-04-27 21:58:13 +02:00
louis-e
b5596548db Optimize WorldEditor performance with strategic #[inline] attributes 2025-04-27 21:57:01 +02:00
Oleg4260
6167466b2f Less vegetation in heathland 2025-04-27 22:56:03 +03:00
louis-e
5e18402017 Add location name to world name 2025-04-27 21:47:25 +02:00
Oleg4260
ec76a5f2e2 Add heath and orchard generation 2025-04-27 22:14:49 +03:00
Oleg4260
349f15807a Final adjustments 2025-04-27 21:27:19 +03:00
Oleg4260
6fdf28ab81 Add beach surface material processing, dead bushes in sand, plants in scrub and grassland 2025-04-27 19:15:30 +03:00
louis-e
c961287290 Adapt code comments 2025-04-27 16:59:56 +02:00
louis-e
1fefb20f71 Fix formatting 2025-04-27 16:52:37 +02:00
louis-e
022c44a7d4 Remove unused code 2025-04-27 16:52:13 +02:00
louis-e
6b8a8ad666 Patch amenities.rs to new relative block setter logic 2025-04-27 16:51:49 +02:00
louis-e
c0e1d0e3b4 Patch buildings.rs to new relative block setter logic 2025-04-27 16:38:17 +02:00
louis-e
fb64d0c360 Add absolute setter support in world_editor.rs 2025-04-27 16:10:13 +02:00
Oleg4260
19cac3ea81 Minor reformatting 2025-04-27 15:18:16 +03:00
Oleg4260
8bad88bdca Refactor editor.check_for_block() 2025-04-27 15:00:42 +03:00
Oleg4260
e62ba6a95a Merge branch 'louis-e:main' into main 2025-04-27 13:46:02 +03:00
Garrett M
d1b18871ce Update leisure generation and fix typo
Fix 'Mincraft' typo (Code still works so not sure what that prefix did)
Add additional types for leisure
2025-04-27 00:07:58 -04:00
Benjamin Wheeler
d4b74fc48a Move GUI logic to its own file. Simplify main fn. 2025-04-26 23:13:32 -04:00
louis-e
38752f2666 Fix fmt for elevation retrieval simplification 2025-04-27 03:35:52 +02:00
louis-e
77a9c23ed3 Simplify elevation retrieval 2025-04-27 03:32:44 +02:00
Louis Erbkamm
987b8b3d74 Merge pull request #422 from louis-e/simplification-refactoring
Remove winter mode as discussed in issues/415
2025-04-27 01:29:06 +02:00
Louis Erbkamm
f398c7e6b8 Removed dirt reference 2025-04-27 01:26:40 +02:00
louis-e
9a759c39db Fix fmt for winter mode removal 2025-04-27 00:51:36 +02:00
louis-e
856cba162e Remove winter mode as discussed in issues/415 2025-04-27 00:48:56 +02:00
Louis Erbkamm
55d0208a32 Merge pull request #411 from HelleBenjamin/main
Update Finnish translation
2025-04-27 00:01:18 +02:00
Louis Erbkamm
b1d20cbd1a Patch --all-features discussed in pull/417 2025-04-26 23:59:07 +02:00
Louis Erbkamm
cca4d1a361 Merge pull request #417 from benjamin051000/ci-cache
CI: Add cache action to preserve build artifacts.
2025-04-26 23:57:11 +02:00
Oleg4260
ae5a838fa3 Optimize ground generation 2025-04-26 19:05:17 +03:00
Louis Erbkamm
06974e2bf7 Arch Linux AUR package 2025-04-26 16:13:17 +02:00
Louis Erbkamm
b769ff34de Merge pull request #113 from adamperkowski/docs/aur
docs(README): add Arch Linux installation instructions
2025-04-26 16:11:18 +02:00
Louis Erbkamm
0f8e302aff Merge branch 'main' into docs/aur 2025-04-26 16:10:45 +02:00
Louis Erbkamm
597051303c Merge pull request #360 from louis-e/dependabot/cargo/dirs-6.0.0
Bump dirs from 5.0.1 to 6.0.0
2025-04-26 16:06:19 +02:00
Louis Erbkamm
08bdc64999 Merge branch 'main' into dependabot/cargo/dirs-6.0.0 2025-04-26 16:06:12 +02:00
Louis Erbkamm
3723127132 Resolve open discussion in pull/354 2025-04-26 15:43:59 +02:00
Louis Erbkamm
f8a1da1967 Merge pull request #354 from TheComputerGuy96/desktop-file
Add a XDG desktop file
2025-04-26 15:43:09 +02:00
Louis Erbkamm
9352ee62b7 Merge pull request #420 from louis-e/revert-line
Revert to second dirt addition line
2025-04-26 15:19:53 +02:00
Louis Erbkamm
8816af5c75 Revert to second dirt addition line 2025-04-26 15:19:38 +02:00
Louis Erbkamm
2fb09d1fba Merge pull request #377 from benjamin051000/formalize-bbox
Formal BBox struct
2025-04-26 15:00:09 +02:00
Benjamin Wheeler
c3ce8829f3 Update GUI bbox to use comma delim. Add gui bbox errors. 2025-04-25 20:28:11 -04:00
Benjamin Wheeler
a3f0d5e367 Formal bounding box type BBox.
`BBox` represents a *valid* bounding box.

It's only possible to have a BBox object that's valid.
2025-04-25 20:28:06 -04:00
Benjamin Helle
d93b771422 Merge branch 'main' into main 2025-04-24 15:47:41 +03:00
Louis Erbkamm
4271dc3b7d Merge pull request #414 from Oleg4260/main
Minor improvements to farmland code
2025-04-22 22:39:49 +02:00
Oleg4260
6732697f46 Use args.ground_level instead of MIN_Y with terrain enabled 2025-04-22 17:56:12 +03:00
Benjamin Helle
4d94ab98a4 Merge branch 'main' into main 2025-04-22 01:34:39 +03:00
Benjamin Wheeler
2c8418bf90 Add cache action to preserve build artifacts.
Github Copilot made this... so who knows if it actually works.
2025-04-21 18:17:08 -04:00
Oleg4260
a1ed2b9dd2 Clean up farmland code 2025-04-20 23:17:35 +03:00
Oleg4260
9b7cabc549 Fix space between water blocks (meant to be 8) 2025-04-20 16:05:45 +03:00
Louis Erbkamm
db47f6ab20 Merge pull request #412 from louis-e/revert-improvement
Revert improvement
2025-04-19 15:13:55 +02:00
louis-e
ef261a24e4 Revert benches in leisure, discussion in pull/406 2025-04-19 15:13:22 +02:00
louis-e
898457e06c Revert improvement, discussion in pull/406 2025-04-19 15:10:04 +02:00
Benjamin Helle
0f84c8a38c Update Finnish translation 2025-04-19 15:39:21 +03:00
Benjamin Helle
f416f650c2 Update Finnish translation 2025-04-19 15:38:28 +03:00
Louis Erbkamm
b98c043bb8 Merge pull request #376 from benjamin051000/ci-cargo-test
ci: run cargo test
2025-04-13 00:45:35 +02:00
Louis Erbkamm
2a1233c463 Merge pull request #374 from benjamin051000/fix-terrain-flag
Set `terrain` arg to store true.
2025-04-13 00:44:37 +02:00
Louis Erbkamm
e1869fbbbc Merge pull request #340 from benjamin051000/refactor-block-defs
Change functions returning vecs to global arrays.
2025-04-13 00:43:11 +02:00
Benjamin Wheeler
bfba692aaf Change functions returning vecs to global arrays.
I'm not sure why these were initally functions. I think they are better
off as global arrays, since the function would initialize a new vec
every time its called, whereas this only initializes it once.
2025-04-10 16:57:29 -04:00
Benjamin Wheeler
1382e05e25 Add cargo test to CI 2025-04-10 16:25:02 -04:00
Benjamin Wheeler
642928057a Add unit tests for --winter, --debug, --terrain flags. 2025-04-10 16:23:09 -04:00
Benjamin Wheeler
1749f6a1f2 Set terrain arg to SetTrue.
This was erroneously set to `SetFalse`, which means it's impossible to
enable the terrain from the cli.

According to clap docs, the default action for a bool arg is SetTrue,
and the default value is false. (https://docs.rs/clap/latest/clap/_derive/index.html#arg-types)

So we don't need to provide any additional args here.
2025-04-10 16:23:09 -04:00
Louis Erbkamm
4c08c5fe72 Patch arabic translation 2025-04-10 22:19:35 +02:00
Louis Erbkamm
8a4961a0a6 Merge pull request #287 from Salmonings/main
Add Arabic language
2025-04-10 22:18:43 +02:00
Louis Erbkamm
05569fb0fc fr-FR.json adaptions from pull/318/ 2025-04-10 22:15:47 +02:00
Louis Erbkamm
f203ad1c09 Merge pull request #396 from Phantomwise/translation-french
Add translation for French (France)
2025-04-10 22:13:39 +02:00
Louis Erbkamm
4d123211ee Merge pull request #398 from xCipHanD/ChineseTranslation
Update Chinese translation
2025-04-10 22:10:35 +02:00
Louis Erbkamm
8a191e563d Merge pull request #407 from louis-e/dependabot/cargo/cargo-6f59152c2a
Bump the cargo group with 5 updates
2025-04-10 22:05:07 +02:00
Louis Erbkamm
9c0db6f1c7 Update README.md 2025-04-10 21:59:07 +02:00
dependabot[bot]
a7638d971a Bump the cargo group with 5 updates
Bumps the cargo group with 5 updates:

| Package | From | To |
| --- | --- | --- |
| [tauri-plugin-shell](https://github.com/tauri-apps/plugins-workspace) | `2.2.0` | `2.2.1` |
| [tokio](https://github.com/tokio-rs/tokio) | `1.44.1` | `1.44.2` |
| [crossbeam-channel](https://github.com/crossbeam-rs/crossbeam) | `0.5.14` | `0.5.15` |
| [openssl](https://github.com/sfackler/rust-openssl) | `0.10.70` | `0.10.72` |
| [ring](https://github.com/briansmith/ring) | `0.17.8` | `0.17.14` |


Updates `tauri-plugin-shell` from 2.2.0 to 2.2.1
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases)
- [Commits](https://github.com/tauri-apps/plugins-workspace/compare/os-v2.2.0...os-v2.2.1)

Updates `tokio` from 1.44.1 to 1.44.2
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.44.1...tokio-1.44.2)

Updates `crossbeam-channel` from 0.5.14 to 0.5.15
- [Release notes](https://github.com/crossbeam-rs/crossbeam/releases)
- [Changelog](https://github.com/crossbeam-rs/crossbeam/blob/master/CHANGELOG.md)
- [Commits](https://github.com/crossbeam-rs/crossbeam/compare/crossbeam-channel-0.5.14...crossbeam-channel-0.5.15)

Updates `openssl` from 0.10.70 to 0.10.72
- [Release notes](https://github.com/sfackler/rust-openssl/releases)
- [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.70...openssl-v0.10.72)

Updates `ring` from 0.17.8 to 0.17.14
- [Changelog](https://github.com/briansmith/ring/blob/main/RELEASES.md)
- [Commits](https://github.com/briansmith/ring/commits)

---
updated-dependencies:
- dependency-name: tauri-plugin-shell
  dependency-version: 2.2.1
  dependency-type: direct:production
  dependency-group: cargo
- dependency-name: tokio
  dependency-version: 1.44.2
  dependency-type: direct:production
  dependency-group: cargo
- dependency-name: crossbeam-channel
  dependency-version: 0.5.15
  dependency-type: indirect
  dependency-group: cargo
- dependency-name: openssl
  dependency-version: 0.10.72
  dependency-type: indirect
  dependency-group: cargo
- dependency-name: ring
  dependency-version: 0.17.14
  dependency-type: indirect
  dependency-group: cargo
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-10 19:51:16 +00:00
Louis Erbkamm
fa6a023b7c Merge pull request #406 from louis-e/pull403-adaptions
Minor adaptions for PR 403
2025-04-10 21:50:09 +02:00
Louis Erbkamm
2ac4cacd2d Merge pull request #363 from louis-e/dependabot/cargo/cargo-2c68f0befb
Bump openssl from 0.10.68 to 0.10.70 in the cargo group
2025-04-10 21:49:17 +02:00
Louis Erbkamm
b334212667 Merge pull request #391 from louis-e/dependabot/cargo/tauri-plugin-log-2.2.2
Bump tauri-plugin-log from 2.2.0 to 2.2.2
2025-04-10 21:48:58 +02:00
Louis Erbkamm
dc7f3f973e Merge pull request #402 from louis-e/dependabot/cargo/tokio-1.44.1
Bump tokio from 1.42.0 to 1.44.1
2025-04-10 21:48:42 +02:00
Louis Erbkamm
44f58dcd22 Merge pull request #401 from louis-e/dependabot/cargo/log-0.4.27
Bump log from 0.4.22 to 0.4.27
2025-04-10 21:48:38 +02:00
louis-e
4c1643281d fmt: Fix formatting 2025-04-10 21:47:35 +02:00
louis-e
6e113746d4 Minor adaptions for PR 403 2025-04-10 21:41:35 +02:00
Louis Erbkamm
6a1d6d32ff Merge pull request #403 from Oleg4260/main
Some improvements for the generation
2025-04-10 21:39:09 +02:00
Oleg4260
8d6d10fc47 Remove ugly "benches" 2025-04-09 17:23:18 +03:00
Oleg4260
c022611d08 Add custom layers for some landuse and natural objects, use stone as a marker not to generate dirt 2025-04-07 18:21:57 +03:00
Oleg4260
5a15ba3a62 Clarify comment 2025-04-07 12:34:02 +03:00
Oleg4260
c526f295c3 cargo fmt 2025-04-07 12:23:43 +03:00
Oleg4260
0e0a08cfc9 Remove stone filling under quarries (doesn't work anymore) 2025-04-07 12:22:58 +03:00
Oleg4260
d992e5eb87 Remove BASE_HEIGHT_SCALE, remove scale.sqrt to match X and Z scale 2025-04-07 10:59:56 +03:00
Oleg4260
5c0e24ee73 fix fmt 2025-04-06 18:29:35 +03:00
Oleg4260
9d85de61a3 Replace water grid with dot grid in farmlands 2025-04-06 18:27:42 +03:00
Oleg4260
b23749b330 Change scale to 1.0 2025-04-05 20:56:35 +03:00
Oleg4260
77debbbc20 Fix clippy error 2025-04-05 15:24:25 +03:00
Oleg4260
8970ce5ffe Remove trees from farmlands 2025-04-05 15:06:47 +03:00
Oleg4260
7a36ac9c3f Improve winter mode 2025-04-05 14:40:19 +03:00
Oleg4260
4363dfd558 Add more natural surfaces 2025-04-05 13:22:52 +03:00
Oleg4260
1aac2e3068 Increase max_y to 319 2025-04-05 01:31:59 +03:00
dependabot[bot]
d16cedde9a Bump tokio from 1.42.0 to 1.44.1
Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.42.0 to 1.44.1.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.42.0...tokio-1.44.1)

---
updated-dependencies:
- dependency-name: tokio
  dependency-version: 1.44.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-01 03:04:46 +00:00
dependabot[bot]
59b71ebd84 Bump log from 0.4.22 to 0.4.27
Bumps [log](https://github.com/rust-lang/log) from 0.4.22 to 0.4.27.
- [Release notes](https://github.com/rust-lang/log/releases)
- [Changelog](https://github.com/rust-lang/log/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/log/compare/0.4.22...0.4.27)

---
updated-dependencies:
- dependency-name: log
  dependency-version: 0.4.27
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-01 03:03:02 +00:00
xciphand
2e01c8c710 Update Chinese Translation 2025-03-26 12:03:17 +08:00
Louis Erbkamm
bff58b39fd Fix cargo fmt 2025-03-23 17:14:13 +01:00
Louis Erbkamm
887e622428 Added fillground if wrapping around bedrock generation 2025-03-23 17:11:01 +01:00
Louis Erbkamm
931f03a784 Merge pull request #337 from Oleg4260/main
Added ores generation in quarries + other changes
2025-03-23 17:09:08 +01:00
Oleg4260
c1c43d9244 Fix stone bricks in rural area 2025-03-22 19:25:06 +02:00
Phantomwise
8a84a08316 Add translation for French (France) 2025-03-20 04:25:32 +01:00
Oleg4260
2c72a61324 sync 2025-03-09 23:09:06 +02:00
Oleg4260
bf263a4f8c fix conflict 2025-03-09 22:56:35 +02:00
Louis Erbkamm
50ba0bad6e Merge pull request #346 from Xatresu/hutranslation
Add Hungarian translation
2025-03-09 21:47:44 +01:00
Louis Erbkamm
1d80e6e047 Merge pull request #378 from benjamin051000/clippy-warnings
Fix clippy warnings
2025-03-09 21:43:35 +01:00
Louis Erbkamm
b5e9bb885d Merge pull request #335 from benjamin051000/refactor-tree
Refactor tree generation
2025-03-09 21:40:38 +01:00
dependabot[bot]
665b8f095b Bump tauri-plugin-log from 2.2.0 to 2.2.2
Bumps [tauri-plugin-log](https://github.com/tauri-apps/plugins-workspace) from 2.2.0 to 2.2.2.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases)
- [Commits](https://github.com/tauri-apps/plugins-workspace/compare/os-v2.2.0...log-v2.2.2)

---
updated-dependencies:
- dependency-name: tauri-plugin-log
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-03-09 20:33:13 +00:00
Louis Erbkamm
75bee6ca97 Merge pull request #321 from benjamin051000/remove-more-gui-deps
Remove gui-only deps when building cli
2025-03-09 21:31:52 +01:00
Oleg4260
41055825ef Replace iron blocks under railways with gravel 2025-03-08 13:56:34 +02:00
Benjamin Wheeler
6fd3a8eda7 Fix clippy warnings 2025-02-21 22:42:44 -05:00
Oleg4260
c578a436b4 Replace light concrete with dirt path for highway:path 2025-02-11 23:52:10 +02:00
Oleg4260
211ac4ed72 Merge branch 'main' of https://github.com/Oleg4260/arnis 2025-02-04 17:02:12 +02:00
Oleg4260
3d0a1c3c4d cargo fmt 2025-02-04 17:02:10 +02:00
Oleg4260
0c9c8e1366 Merge branch 'main' of https://github.com/Oleg4260/arnis 2025-02-04 17:00:15 +02:00
Oleg4260
0e28d34224 Use editor.fill_blocks() instead of loop 2025-02-04 16:59:09 +02:00
Oleg4260
3b1425cd30 Merge branch 'main' of https://github.com/Oleg4260/arnis 2025-02-04 16:08:20 +02:00
Oleg4260
ce0bce99fb Added feature to fill ground with stone
Trying to fix compilation error
2025-02-04 16:08:09 +02:00
Oleg4260
cde0042b85 Trying to fix compilation error 2025-02-04 00:22:49 +02:00
Oleg4260
622edaff07 Added feature to fill ground with stone 2025-02-04 00:06:09 +02:00
dependabot[bot]
ca760563d1 Bump openssl from 0.10.68 to 0.10.70 in the cargo group
Bumps the cargo group with 1 update: [openssl](https://github.com/sfackler/rust-openssl).


Updates `openssl` from 0.10.68 to 0.10.70
- [Release notes](https://github.com/sfackler/rust-openssl/releases)
- [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.68...openssl-v0.10.70)

---
updated-dependencies:
- dependency-name: openssl
  dependency-type: indirect
  dependency-group: cargo
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-03 18:51:25 +00:00
dependabot[bot]
f278d629eb Bump dirs from 5.0.1 to 6.0.0
Bumps [dirs](https://github.com/soc/dirs-rs) from 5.0.1 to 6.0.0.
- [Commits](https://github.com/soc/dirs-rs/commits)

---
updated-dependencies:
- dependency-name: dirs
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-01 02:40:47 +00:00
Echo J
2c319bae5d Add a XDG desktop file
This allows proper packaging of the application for Linux distros
2025-01-29 20:55:49 +02:00
Xatres
809ff2793d Add files via upload 2025-01-27 03:35:52 +01:00
Benjamin Wheeler
3ba9c58f85 element_processing/tree: Make all trees conform to a struct.
This decouples the data that each tree has with the block-placing
procedure. Now, all the data about a tree is stored in `struct Tree`,
and the `Tree::create()` function handles all paths accordingly.
2025-01-25 23:39:38 -05:00
Benjamin Wheeler
66b7f47e32 element_processing/tree: Update create_tree signature
x, y, z -> (x, y, z)

Also some small variable renames
2025-01-25 23:39:38 -05:00
Benjamin Wheeler
a96911e112 element_processing/tree: DRY on fill calls, use j with y.
This commit is a little messy:
- It reduces repitition of the block fill calls and the snow layer calls
- It also replaces previous usage of `y + i` with `y + j` to keep the
  variable conventions the same.
2025-01-25 23:39:35 -05:00
Benjamin Wheeler
112481f36f Remove gui-only deps when building cli
It looks like these are only GUI dependencies. I still need to test that
it compiles, but these give unused warnings when compiling with the gui
disabled.
2025-01-25 22:03:16 -05:00
Benjamin Wheeler
65cd0d453a element_processing/tree: replace round{1,2,3} with generic round
round takes a parameter which is a reference to an array of patterns.
The patterns are defined at the top of the file as `[(i32, i32, i32)]`.
2025-01-25 21:33:13 -05:00
Benjamin Wheeler
febd1b7a3e element_processing/tree: Use loops to reduce repitition 2025-01-25 21:33:13 -05:00
Oleg4260
6b527855e4 cargo fmt 2025-01-25 20:07:03 +02:00
Oleg4260
cc1e28b80a Added ores generation in quarries 2025-01-25 20:03:16 +02:00
Louis Erbkamm
a969d65ae4 Trigger ci-build.yml only when files in src/ have changed 2025-01-25 14:15:23 +01:00
Louis Erbkamm
acf123488a Merge pull request #333 from Oleg4260/main
Add landuse for quarry and landfills + add one advice in FAQ
2025-01-25 14:10:08 +01:00
Louis Erbkamm
938a2d74ad Merge pull request #334 from wielandb/hedge-fix
Make leaves persistent to stop hedges from decaying
2025-01-25 14:09:02 +01:00
Louis Erbkamm
33144a149c Merge pull request #336 from TheComputerGuy96/lt-update
Update Lithuanian translation
2025-01-25 14:07:18 +01:00
Echo J
fbb0f845cd Update Lithuanian translation 2025-01-25 12:20:30 +02:00
Wieland
c71cd111ca Make leaves persistent 2025-01-24 22:41:30 +01:00
Oleg4260
04d9d5269f Put changes back again (i messed up with merging lmao) 2025-01-24 20:29:43 +02:00
Oleg4260
f53e4d65e3 Merge branch 'main' of https://github.com/Oleg4260/arnis 2025-01-24 20:20:27 +02:00
Oleg4260
c39d6fc1ef Merge branch 'louis-e:main' into main 2025-01-24 20:12:53 +02:00
Oleg4260
a1c69b4cb0 Did cargo fmt 2025-01-24 20:11:10 +02:00
Louis Erbkamm
b57719b0f4 Merge pull request #317 from krvstek/main
Update Polish translation
2025-01-24 17:21:41 +01:00
Louis Erbkamm
893945b98a Merge pull request #324 from Denisskas/main
Update Russian translation
2025-01-24 17:19:19 +01:00
Oleg4260
a57c5f1f1b Add landuse for quarry and landfill 2025-01-23 23:37:28 +02:00
Oleg4260
718389e88d Revert "Replaced iron blocks under railways with gravel"
This reverts commit 3f4536e04f.
2025-01-23 20:50:33 +02:00
Oleg4260
3f4536e04f Replaced iron blocks under railways with gravel 2025-01-23 19:43:57 +02:00
Oleg4260
1f79285e83 Update README.md
I had an issue of the program not opening when I switched to KDE and removed some gtk libraries i don't need, I found out that webkit2gtk-4.1 is required, so I think this should be in the FAQ as this might help others with the same issue
2025-01-23 18:11:45 +02:00
Adham Hakki
31dca8b0b7 Merge branch 'main' into main 2025-01-22 21:26:37 +02:00
Denisskas
54791388d1 Update ru.json 2025-01-22 13:18:47 +04:00
krvstek.
7fa05d3e7b Update Polish translation 2025-01-21 23:02:33 +00:00
Louis Erbkamm
daf07bd743 Merge pull request #316 from louis-e/prepare-release-fmt
Handle block properties in new saving logic
2025-01-21 23:36:26 +01:00
louis-e
163ab0407d Handle block properties in new saving logic 2025-01-21 23:36:04 +01:00
Louis Erbkamm
0361e7d63d Merge pull request #315 from louis-e/prepare-release
Prepare release
2025-01-21 23:33:02 +01:00
louis-e
bc422460ff Handle block properties in new saving logic 2025-01-21 23:28:55 +01:00
louis-e
53f0097884 Prepare Alpine Release 2025-01-21 23:28:04 +01:00
Louis Erbkamm
bbfb63886d Update README.md 2025-01-21 22:37:38 +01:00
Louis Erbkamm
928f487a29 Merge pull request #260 from austenadler/feature/allow-disabling-gui
Allow disabling gui at compile time
2025-01-21 22:34:57 +01:00
Louis Erbkamm
ff7a09061e Merge branch 'main' into feature/allow-disabling-gui 2025-01-21 22:13:27 +01:00
Louis Erbkamm
911ec00ddb Merge pull request #312 from louis-e/minor-tweaks
Minor tweaks
2025-01-21 20:47:28 +01:00
louis-e
54137f2117 Updated README 2025-01-21 20:46:53 +01:00
louis-e
50d38a1dd4 Localization formatting changes 2025-01-21 20:44:08 +01:00
louis-e
e5ab62eb18 Added comments for better documentation 2025-01-21 20:36:39 +01:00
Louis Erbkamm
1a8a3114f4 Merge pull request #299 from HelleBenjamin/main
Add Finnish translation
2025-01-21 20:31:58 +01:00
Louis Erbkamm
a52ba2bd39 Merge pull request #289 from TheComputerGuy96/klaipeda
Translation support rework
2025-01-21 20:30:34 +01:00
Benjamin Helle
8195f0bc6e Merge branch 'main' into main 2025-01-21 16:49:03 +02:00
Louis Erbkamm
4df4a3de32 Merge pull request #306 from wielandb/main
Add "razed" to values of railway=* not rendered
2025-01-20 23:50:07 +01:00
Louis Erbkamm
e65a1ee37e Merge branch 'main' into main 2025-01-20 23:47:10 +01:00
Louis Erbkamm
66e47e190a Merge branch 'main' into klaipeda 2025-01-20 23:46:22 +01:00
Louis Erbkamm
8755fd3285 Merge pull request #308 from louis-e/elevation-wip
Merge Elevation feature
2025-01-20 23:44:28 +01:00
louis-e
982ef56b29 Fix chunk in wrong location issue with unfinished region patch 2025-01-20 23:13:44 +01:00
louis-e
28070d3c51 Fix chunk in wrong location issue with unfinished region patch 2025-01-20 23:03:57 +01:00
louis-e
d9a0a4aa86 CI (fmt): Fix formatting 2025-01-20 22:45:02 +01:00
louis-e
1f0f6676ed Added railway orientation blocks 2025-01-20 21:28:00 +01:00
louis-e
ff44fe4eda Adapted update messages 2025-01-20 21:27:37 +01:00
louis-e
42976b0113 Fixed railway orientation 2025-01-20 21:27:07 +01:00
louis-e
55b170fb7d TODO Edits 2025-01-20 21:26:54 +01:00
louis-e
852bbf2236 Added self signed signature to Windows release and added Mac release 2025-01-20 21:24:07 +01:00
louis-e
cc6080c0c3 Adapt aeroways to new elevation logic 2025-01-20 20:17:44 +01:00
louis-e
5672ca3f1e Update player rotation in world generation and minor tweaks 2025-01-20 20:00:00 +01:00
Wieland
fc29544835 Fix indentation 2025-01-19 03:35:13 +01:00
Wieland
bf6ac1f61a Add "turntable" to values that should not be rendered 2025-01-19 03:32:13 +01:00
louis-e
8c17a5b0bb Modify player position for world generation 2025-01-19 02:53:37 +01:00
Wieland
bc6ffa3bf9 Change formatting 2025-01-19 02:22:58 +01:00
louis-e
dec0317790 Implement fixes for elevation 2025-01-19 01:46:58 +01:00
louis-e
091acd5849 Added dynamic year in license 2025-01-19 01:46:37 +01:00
Wieland
056203fb21 Add "razed" to values of railway=* not rendered 2025-01-19 01:41:28 +01:00
louis-e
415c9d33fe Bresenham algorithm optimization 2025-01-19 00:14:23 +01:00
louis-e
1820112093 CI (fmt) fix: Merge main into elevation-wip 2025-01-19 00:08:26 +01:00
louis-e
c573a02fd6 Optimized cartesian 2025-01-18 23:52:08 +01:00
louis-e
4c6b9833eb Optimized bresenham algorithm performance 2025-01-18 23:51:41 +01:00
louis-e
8cb8d76357 Set terrain toggle to not-default on 2025-01-18 23:51:17 +01:00
louis-e
fc105b84e0 Merge main into elevation-wip 2025-01-18 21:23:53 +01:00
louis-e
f873a7ab69 Merge branch 'main' into elevation-wip 2025-01-18 18:43:03 +01:00
louis-e
61a67240a6 WIP: Save changes before merging main 2025-01-18 18:35:39 +01:00
Austen Adler
c0753ab23e Format with consistent style 2025-01-16 22:41:53 -05:00
Austen Adler
9461d1f46e Merge remote-tracking branch 'origin/main' into feature/allow-disabling-gui 2025-01-16 22:41:22 -05:00
Austen Adler
3036237fdf Free and reattach to console when running on Windows 2025-01-16 22:31:32 -05:00
Benjamin Helle
95e71b8da5 Added finnish language json 2025-01-17 00:57:53 +02:00
Echo J
255786bc93 Add Lithuanian translation
This may be strange in some places though
2025-01-15 16:44:13 +02:00
Echo J
3c552fe5ed Make placeholder strings translatable (and license one too)
There's some strings coming from the Rust side though (which
will require extra code work)
2025-01-15 16:44:13 +02:00
Echo J
49ff415316 Use localization helper function for JS-based HTML elements 2025-01-15 16:44:13 +02:00
Echo J
71315c60ea Rework applyLocalization() function
This removes all of the boilerplate for setting strings (now the
strings are set by looping through an object and calling a helper function)

The helper function also has an English string fallback if a translation
doesn't have one

And finally some functions/.html code were adjusted to simplify the localization
helper function (this also means innerHTML is no longer used for safety)
2025-01-15 16:44:11 +02:00
Echo J
18b1ea0e0b Don't hardcode language codes
This will make adding a new translation a bit easier (this change
also accepts full codes for language variations like en-UK or pt-BR)

Also specify a full code for English and Chinese translations (Chinese
variation was found with a translation tool's language detector so
it might not be accurate)
2025-01-15 16:43:23 +02:00
Echo J
c6a8da0b40 Remove unused translation strings
These 2 strings are a duplicate of existing ones (which should
reduce translation boilerplate a bit)
2025-01-15 16:43:23 +02:00
Louis Erbkamm
308498550b Merge pull request #290 from TheComputerGuy96/misc-fixes
Miscellaneous fixes
2025-01-15 14:35:16 +01:00
Louis Erbkamm
f7e917edc7 Merge pull request #286 from RedAuburn/better-fences
Support barrier / fence types
2025-01-15 14:32:09 +01:00
Echo J
8221da46e0 Add a NVIDIA WebKit workaround 2025-01-14 21:30:19 +02:00
Echo J
3645b7edd7 Fix wrong variable in an error handler 2025-01-14 21:01:17 +02:00
Echo J
606779f681 Set a border CSS property for buttons/input boxes
For some reason the background color isn't applied on input boxes
(only on WebKit) if I don't set this
2025-01-14 20:43:56 +02:00
Echo J
dce5f472f0 Make the GUI partially work in a web browser
The lack of window.__TAURI__ object prevents most of the JS code
from running (this change stubs it which allows the Tauri GUI to
be tested in a web browser with a simple web server like PHP's one)
2025-01-14 20:39:08 +02:00
Harry Bond
f4bf8c1d3c Support barrier / fence types 2025-01-13 22:22:28 +00:00
Adham Hakki
7ae9ac35d1 Add Arabic language
Just love the idea and the project so a little bit of contributing might help! Here's the Arabic locales for the program! Just be careful as Arabic is a RTL language so it might go wrong/weird
2025-01-13 21:32:29 +02:00
louis-e
686ac2c181 Fix rebasing issues 2025-01-12 22:45:50 +01:00
Louis Erbkamm
b334ed9841 Merge pull request #280 from krvstek/main
simplification & fixes for Polish
2025-01-12 22:26:27 +01:00
louis-e
96dc9ced30 Merge branch 'main' into elevation-wip 2025-01-12 22:23:22 +01:00
krvstek.
03d86f4552 simplification & fixes for Polish 2025-01-12 21:03:15 +00:00
Louis Erbkamm
6e3406f117 Merge pull request #276 from zer0-dev/russia_overpass_workaround
Add fallback api urls specifically for Russia
2025-01-12 20:05:16 +01:00
zer0-dev
7e929d5ef3 Add fallback api urls specifically for Russia 2025-01-12 21:27:18 +03:00
Louis Erbkamm
49a5ed8157 Merge pull request #272 from louis-e/park-relation-fix
Park relation fix and faster saving
2025-01-12 18:01:05 +01:00
louis-e
f60170ef59 CI (fmt) fix: Fixed leisure generation for multipolygons 2025-01-12 17:50:13 +01:00
louis-e
b34bf4f646 CI (fmt) fix: Fixed leisure generation for multipolygons 2025-01-12 17:46:56 +01:00
Austen Adler
efc14821cf Remove note about running with no-default-features 2025-01-12 11:46:30 -05:00
louis-e
ba9c7df5ff Merge branch 'main' into park-relation-fix 2025-01-12 17:41:16 +01:00
louis-e
3eb29a0c21 Fixed leisure generation for multipolygons 2025-01-12 17:38:51 +01:00
louis-e
17ead3c2fc Fixed leisure generation for multipolygons 2025-01-12 17:37:30 +01:00
louis-e
f661f174bd Optimize world save with parallel chunks & buffer reuse 2025-01-12 17:15:09 +01:00
louis-e
7792930277 Optimize world save with parallel chunks & buffer reuse 2025-01-12 17:05:45 +01:00
louis-e
18d3e45d2c Optimize world save with parallel chunks & buffer reuse 2025-01-12 17:05:32 +01:00
Louis Erbkamm
c2b9f87688 Update bug_report.md 2025-01-12 16:39:20 +01:00
Louis Erbkamm
0850bca4de Update prerelease.yml 2025-01-12 16:32:31 +01:00
Louis Erbkamm
ef25c669c1 Merge pull request #270 from louis-e/prerelease-action
Added prerelease workflow
2025-01-12 16:20:12 +01:00
louis-e
df09afe868 Added prerelease workflow 2025-01-12 16:19:42 +01:00
Louis Erbkamm
e9a2329e38 Update README.md 2025-01-12 16:10:56 +01:00
Louis Erbkamm
9cb919eeae Merge pull request #269 from louis-e/readme-enhancement
Readme enhancements and credits addition
2025-01-12 16:05:05 +01:00
Louis Erbkamm
e2c9b07e91 Merge branch 'main' into readme-enhancement 2025-01-12 16:04:14 +01:00
louis-e
3efb8460c1 Readme enhancements and credits addition 2025-01-12 16:02:56 +01:00
Louis Erbkamm
0efa681bb9 Merge pull request #253 from zer0-dev/main
Fix tall grass generating on non-grass blocks. Colored roofs only for single houses
2025-01-12 01:27:08 +01:00
Louis Erbkamm
a92c5bb01f Merge pull request #267 from zer0-dev/custom_bbox_show
Show custom bbox on map-container
2025-01-12 00:18:33 +01:00
zer0-dev
408e182be2 Show custom bbox on map-container 2025-01-11 21:45:42 +03:00
zer0-dev
ea3cf80472 Add SNOW_BLOCK to whitelist for tall grass generation. Sort parsed_elements to put landuse elements in the end 2025-01-11 20:47:02 +03:00
zer0-dev
28ecbb58e7 Merge branch 'louis-e:main' into main 2025-01-11 19:47:08 +03:00
Louis Erbkamm
7b7ff6b534 Merge pull request #265 from louis-e/russian-line-breaking
Simplified translation to avoid line breaking
2025-01-11 17:09:09 +01:00
louis-e
5e6eb0969b Simplified translation to avoid line breaking 2025-01-11 17:06:44 +01:00
Louis Erbkamm
9d6c528438 Merge pull request #257 from zer0-dev/min_level_fix
Fix building levels counting as difference between buildng:levels and building:min_level
2025-01-11 17:04:47 +01:00
Louis Erbkamm
920725d21f Merge pull request #258 from RedAuburn/kerbs
Ignore barrier=kerb
2025-01-11 17:04:16 +01:00
Louis Erbkamm
3689bfbf6d Merge pull request #259 from RedAuburn/mc-flatpak
Use Minecraft Flatpak directory if it exists
2025-01-11 17:04:05 +01:00
Louis Erbkamm
8ed864210f Merge branch 'main' into main 2025-01-11 16:55:50 +01:00
Louis Erbkamm
a0d242716d Merge branch 'main' into min_level_fix 2025-01-11 16:53:56 +01:00
Louis Erbkamm
a604e546a7 Merge branch 'main' into kerbs 2025-01-11 16:53:23 +01:00
Louis Erbkamm
3e88da384a Merge branch 'main' into feature/allow-disabling-gui 2025-01-11 16:53:11 +01:00
Louis Erbkamm
3c5f5eff24 Merge branch 'main' into mc-flatpak 2025-01-11 16:52:55 +01:00
Louis Erbkamm
c750b90719 Merge pull request #264 from louis-e/clippy-fix
Fixed CI Clippy warnings
2025-01-11 16:52:37 +01:00
louis-e
553dce3c3b Fixed CI Clippy warnings 2025-01-11 16:50:31 +01:00
Harry Bond
24d7a7e3eb Use Minecraft Flatpak directory if it exists 2025-01-11 12:05:42 +00:00
zer0-dev
b34a9c851c Formatting 2025-01-11 11:38:36 +03:00
zer0-dev
1274781223 Formatting 2025-01-11 11:25:05 +03:00
Austen Adler
ab21b88c90 Allow disabling gui 2025-01-10 22:49:40 -05:00
Harry Bond
9470bbf87f Ignore kerbs
Signed-off-by: Harry Bond <me@hbond.xyz>
2025-01-10 23:11:54 +00:00
zer0-dev
c4e27b6059 Fix Github Actions CI 2025-01-10 23:01:54 +03:00
zer0-dev
c26cb933dc Fix building levels counting as difference between buildng:levels and building:min_level 2025-01-10 22:58:00 +03:00
zer0-dev
83be3c7c64 Fix tall grass generating on non-grass blocks. Change random roof color to generate only on single houses 2025-01-09 23:04:17 +03:00
Louis Erbkamm
999dd8db51 Fix Github Actions CI 2025-01-08 01:00:58 +01:00
Louis Erbkamm
9570d0533c Update version 2025-01-08 00:48:03 +01:00
Louis Erbkamm
103fe83efc Update version 2025-01-08 00:47:52 +01:00
Louis Erbkamm
155f66dfb1 Removed obsolete .log suffix 2025-01-08 00:40:47 +01:00
Louis Erbkamm
9ea8e8860a Removed unreliable API servers 2025-01-08 00:36:11 +01:00
Louis Erbkamm
cc5e691531 Merge pull request #241 from louis-e/data-retrieval-error-handling
Improved error handling and fixed some minor bugs
2025-01-07 23:54:31 +01:00
louis-e
9b33ed17ce CI (fmt) fix: Improved error handling and fixed some minor bugs 2025-01-07 23:53:07 +01:00
louis-e
bac263311a Improved error handling and fixed some minor bugs 2025-01-07 23:45:51 +01:00
Louis Erbkamm
486541b14a Updated license 2025-01-07 22:28:07 +01:00
Louis Erbkamm
7cfb78b0e1 Merge pull request #240 from amir16yp/main
Add generic linux binary to releases workflow
2025-01-07 22:26:32 +01:00
Louis Erbkamm
dbd96cfdac Merge pull request #238 from louis-e/translation-patch
Added Swedish and Korean, fixed Spanish
2025-01-07 22:20:31 +01:00
Louis Erbkamm
e4ed404f5e Merge pull request #237 from louis-e/minimum-height-parking
Ensure minimum height for parking structure
2025-01-07 22:20:20 +01:00
Amir Y. Perehodnik
b6838fdbb1 Merge branch 'louis-e:main' into main 2025-01-07 23:14:35 +02:00
Amir Y. Perehodnik
ac9bfab3e6 just do linux and windows for now 2025-01-07 23:03:07 +02:00
louis-e
dc57d092f8 Added Swedish and Korean, fixed Spanish 2025-01-07 21:59:45 +01:00
louis-e
357dded61a Ensure minimum height for parking structure 2025-01-07 21:52:57 +01:00
Louis Erbkamm
edba29bf2b Merge pull request #236 from louis-e/buildings-min_level
Support building:min_level tag for elevated building parts
2025-01-07 21:47:20 +01:00
Louis Erbkamm
410bd7b926 Merge branch 'main' into buildings-min_level 2025-01-07 21:35:47 +01:00
Louis Erbkamm
14d93526d4 Merge pull request #235 from louis-e/scale-adaptive-building-height
Scale adaptive building height
2025-01-07 21:34:49 +01:00
louis-e
273e02d626 Support building:min_level tag for elevated building parts 2025-01-07 21:34:32 +01:00
louis-e
88e7cc35a9 Adapt building height automatically to scale 2025-01-07 21:23:53 +01:00
louis-e
37cd210104 Adapt building height automatically to scale 2025-01-07 21:22:46 +01:00
Louis Erbkamm
ed22a6cd99 Merge pull request #233 from louis-e/aeroways
Implemented aeroways
2025-01-07 21:10:57 +01:00
Amir Y. Perehodnik
ecaaea5da1 make it only support linux and windows x64 2025-01-07 22:06:03 +02:00
Amir Y. Perehodnik
43e8cce970 whoops 2025-01-07 22:01:59 +02:00
Amir Y. Perehodnik
f05ed0c3dc mac isnt compiling, try linux x86 and x64 and windows x86 and x64 2025-01-07 22:01:43 +02:00
Amir Y. Perehodnik
9be60f7805 remove arm64 linux, not compiling for some reason 2025-01-07 21:58:53 +02:00
louis-e
366a651925 Implemented aeroways 2025-01-07 20:58:36 +01:00
Amir Y. Perehodnik
6c593694d0 Update release.yml 2025-01-07 21:55:44 +02:00
Amir Y. Perehodnik
09d3b891bb Add arm64 mac os and linux 2025-01-07 21:50:20 +02:00
Amir Y. Perehodnik
a841178d46 Merge branch 'louis-e:main' into main 2025-01-07 21:49:16 +02:00
Louis Erbkamm
aea28d185d Merge pull request #232 from louis-e/multipolygon-building-levels-fix
fix: respect building:levels tag from OSM relations
2025-01-07 20:41:22 +01:00
Amir Y. Perehodnik
3af10a2a6b include generic linux binary in releases workflow 2025-01-07 21:37:07 +02:00
louis-e
6e8160cf73 CI (fmt) fix: respect building:levels tag from OSM relations 2025-01-07 20:30:11 +01:00
louis-e
1c0a3b3035 CI (fmt) fix: respect building:levels tag from OSM relations 2025-01-07 20:26:28 +01:00
louis-e
b4a9852ecc fix: respect building:levels tag from OSM relations 2025-01-07 20:23:56 +01:00
Louis Erbkamm
05cd857c5f Merge pull request #230 from louis-e/apache-license
License Change from GPL-3.0 to Apache 2.0
2025-01-07 14:22:35 +01:00
Louis Erbkamm
dba0e4512a Merge pull request #231 from louis-e/apache-license-1
Update README.md
2025-01-07 14:22:16 +01:00
Louis Erbkamm
23e55e0c27 Update README.md 2025-01-07 14:21:42 +01:00
Louis Erbkamm
5d2cdee14f License Change from GPL-3.0 to Apache 2.0
**Summary:**
This pull request proposes changing the project's license from GPL-3.0 to Apache License 2.0. The primary motivation for this change is to address ongoing issues with unauthorized websites and individuals misusing the project's name and branding without proper attribution or permission. The Apache 2.0 license offers additional protections, including a trademark clause that prevents misuse of the project name in a way that could mislead users.

**Reason for the Change:**
We've recently encountered several instances of unauthorized websites falsely presenting themselves as official sources of Arnis. While the GPL-3.0 license ensures the project's openness, it lacks provisions to prevent brand misuse. The Apache 2.0 license requires users to give proper attribution and explicitly prohibits using the project's name or branding without permission.

**Request for Approval:**
As contributors to this project, your approval is required for this license change. Please review the proposed change and provide your feedback or approval. Your contributions are highly valued, and your consent is necessary to proceed with this transition.

Thank you for your support in protecting the integrity of the Arnis project! The project will remain open source and free for everyone to use, modify, and contribute to, as it has always been.
2025-01-07 14:15:20 +01:00
Louis Erbkamm
8d91d98a20 Merge pull request #221 from ctrlaltf2/main 2025-01-07 11:24:52 +01:00
ctrlaltf2
a2d61702f1 Add dependencies for building to flake.nix 2025-01-06 23:54:57 -05:00
Louis Erbkamm
893f8c3802 Update README.md 2025-01-07 00:06:46 +01:00
louis-e
ac8c5bf466 Enabled terrain by default 2025-01-06 23:13:48 +01:00
louis-e
e4c6208b22 Added elevation as settings feature 2025-01-06 23:12:42 +01:00
louis-e
f5144d7ba4 Added terrain logic to other element processors 2025-01-06 22:23:42 +01:00
louis-e
f50e10891b Patched all remaining element processors to new elevation logic (except for bridges) 2025-01-06 20:13:31 +01:00
Louis Erbkamm
66819a577b Merge pull request #209 from louis-e/main
Bring elevation-wip up to date to main code base
2025-01-06 17:53:51 +01:00
Louis Erbkamm
85f3e55f04 Merge pull request #207 from shiksyt/main
Update russian translate
2025-01-06 17:39:39 +01:00
Louis Erbkamm
8c270b71bb Merge pull request #208 from TheComputerGuy96/shell-fix
Initialize the Tauri shell plugin
2025-01-06 17:28:38 +01:00
Louis Erbkamm
49ead6c42e Merge pull request #199 from TheComputerGuy96/cargotoml-cleanup
Cargo.toml cleanup
2025-01-06 17:15:32 +01:00
Echo J
1baa0d9d40 Initialize the Tauri shell plugin
This fixes the GitHub link in the main window
2025-01-06 18:13:27 +02:00
Echo J
028ef4bd50 Switch to ThinLTO for release builds
This apparently reduces build time with the same LTO performance
gain
2025-01-06 17:51:22 +02:00
sh1kcs
596231f50b Update ru.json 2025-01-06 21:40:09 +06:00
Echo J
f8fc8e4020 Remove empty features list from some crates
I'm not sure why this was in place
2025-01-06 17:39:47 +02:00
sh1kcs
9417f0e67b Update ru.json 2025-01-06 21:38:08 +06:00
sh1kcs
5e70a9c7e3 Update ru.json 2025-01-06 21:36:12 +06:00
Louis Erbkamm
df65d2393e Merge pull request #205 from louis-e/localization-feedback 2025-01-06 16:26:07 +01:00
Louis Erbkamm
7c4eee955c Merge branch 'main' into localization-feedback 2025-01-06 16:13:17 +01:00
Louis Erbkamm
8ca2cf9ab9 Merge pull request #197 from TheComputerGuy96/linux-fixes
Linux fixes
2025-01-06 16:11:43 +01:00
louis-e
97e70bfef0 Implemented translation feedback for Ukrainian and Russian 2025-01-06 16:10:40 +01:00
Louis Erbkamm
b52f5fb552 Merge pull request #201 from krvstek/main
Add Polish language
2025-01-06 15:59:16 +01:00
Louis Erbkamm
bad6c6df57 Merge pull request #198 from TheComputerGuy96/ci-changes
CI changes/improvements
2025-01-06 15:49:06 +01:00
Echo J
8999fc9a26 Bring back the Ubuntu CI builds
After adding extra dependencies, that build job turns green again

This is basically a revert of 5a215c1eda
2025-01-06 16:28:37 +02:00
Echo J
40d28e0d93 Switch to default xdg-portal for rfd
The GTK 3 backend of rfd is relatively problematic (it causes
a whole app freeze when the command function isn't async and
a SIGABRT on app exit when it is async: https://github.com/tauri-apps/plugins-workspace/issues/2255)
so use the better-working xdg-portal backend instead (this will
also help with Flatpak compatibility)

This also removes the unused tauri-plugin-dialog dependency
(which conflicts with our rfd features)
2025-01-06 16:28:33 +02:00
Louis Erbkamm
8e2ad72dc8 Merge pull request #202 from louis-e/logging
Added logging for improved crash analysis
2025-01-06 14:41:27 +01:00
louis-e
49b08a84af Added logging for improved crash analysis 2025-01-06 14:29:37 +01:00
louis-e
2beee07f98 Added logging for improved crash analysis 2025-01-06 14:25:46 +01:00
louis-e
a21c92849e Added logging for improved crash analysis 2025-01-06 14:16:59 +01:00
louis-e
2844c812e0 Merge branch 'logging' of https://github.com/louis-e/arnis into logging 2025-01-06 14:16:32 +01:00
louis-e
aeeb1912d3 Added logging for improved crash analysis 2025-01-06 14:15:49 +01:00
Louis Erbkamm
08d7f7dbbe Merge branch 'main' into logging 2025-01-06 13:57:56 +01:00
louis-e
73f87162c9 Added logging for improved crash analysis 2025-01-06 13:56:50 +01:00
krvstek.
ccf7784848 Add Polish language 2025-01-06 12:37:06 +00:00
Echo J
704249b5cc Switch to a maintained Rust toolchain action
This removes the set-output warnings too
2025-01-06 13:09:40 +02:00
Echo J
6d0c03862c Allow manual runs for CI workflow
This might make debugging CI issues easier
2025-01-06 13:09:39 +02:00
Echo J
bd2a852105 Freeze Cargo state for release workflow 2025-01-06 12:51:56 +02:00
louis-e
c0778c265f Resolved merge conflicts between elevation-wip and main 2025-01-06 02:00:49 +01:00
Louis Erbkamm
a513f0e230 Merge pull request #188 from Ilya114/main
Add Ukrainian add some fixes for russian translation
2025-01-05 23:45:39 +01:00
Louis Erbkamm
c2c9f2e556 Added Ukrainian to main.js 2025-01-05 23:38:22 +01:00
Ilya114
712127228d Rename uk.json to ua.json 2025-01-05 21:17:59 +02:00
Ilya114
3ee1b80ea2 Update ru.json 2025-01-05 20:09:03 +02:00
Ilya114
b1c0f39a65 Create uk.json 2025-01-05 20:08:47 +02:00
Ilya114
23233a5f11 Update ru.json 2025-01-05 20:01:03 +02:00
Louis Erbkamm
424e2751a6 Merge pull request #186 from louis-e/language-support
Added additional support for Spanish, Russian, Chinese and German
2025-01-05 17:52:06 +01:00
louis-e
458f709931 Added additional support for Spanish, Russian, Chinese and German 2025-01-05 17:24:36 +01:00
louis-e
9ad0b5d5ee Added additional support for Spanish, Russian, Chinese and German 2025-01-05 17:11:00 +01:00
Louis Erbkamm
47231f5121 Merge pull request #179 from louis-e/parking-buildings
Added multi level parking buildings
2025-01-05 15:54:38 +01:00
louis-e
4f749d3e98 CI (fix) fmt: Added multi level parking buildings 2025-01-05 15:24:39 +01:00
Louis Erbkamm
7fb4670c87 Update README.md 2025-01-05 15:19:19 +01:00
louis-e
451c346f3d CI (fix) fmt: Added multi level parking buildings 2025-01-05 15:12:23 +01:00
louis-e
2c996637d4 Added multi level parking buildings 2025-01-05 15:10:58 +01:00
Louis Erbkamm
96cbf2ac96 Updated version 2025-01-05 00:38:20 +01:00
Louis Erbkamm
feab8cea98 Updated version 2025-01-05 00:38:10 +01:00
Louis Erbkamm
8128270a57 Merge pull request #169 from louis-e/embed-bootstrapper
Embed bootstrapper
2025-01-05 00:08:29 +01:00
Louis Erbkamm
8ab5745efa Merge branch 'main' into embed-bootstrapper 2025-01-04 23:57:27 +01:00
Louis Erbkamm
8291a94e13 Merge pull request #168 from louis-e/fix-shelter
Fix amenity shelter elements
2025-01-04 23:57:18 +01:00
louis-e
8d5d96f88a Embed WebView2 bootstrapper 2025-01-04 23:52:06 +01:00
louis-e
5008ddd988 Fix amenity shelter elements 2025-01-04 23:45:09 +01:00
Louis Erbkamm
4a200e01f8 Merge pull request #166 from louis-e/no-world-fix
No world selected fix
2025-01-04 23:37:53 +01:00
Louis Erbkamm
eb9e349cdb Update README.md 2025-01-04 23:23:05 +01:00
Louis Erbkamm
4ccb8a492b Merge branch 'main' into no-world-fix 2025-01-04 23:19:57 +01:00
Louis Erbkamm
a7a74fecdb Merge pull request #165 from louis-e/multipolygon-support
Fix: Generate multipolygon buildings from OSM relations
2025-01-04 23:18:44 +01:00
Louis Erbkamm
364e4933ac Added multipolygon support done 2025-01-04 23:18:12 +01:00
louis-e
b7db71209e Fix logic to make sure that generation cannot be started when no world is selected 2025-01-04 23:09:51 +01:00
louis-e
ae4c8371ae Fix: Generate multipolygon buildings from OSM relations 2025-01-04 22:58:47 +01:00
Louis Erbkamm
14aa8e94d5 Merge pull request #133 from louis-e/dependabot/cargo/itertools-0.14.0
Update itertools requirement from 0.13.0 to 0.14.0
2025-01-04 22:03:09 +01:00
Louis Erbkamm
8f739e0189 Merge pull request #134 from louis-e/dependabot/cargo/geo-0.29.3
Update geo requirement from 0.28.0 to 0.29.3
2025-01-04 22:02:47 +01:00
Louis Erbkamm
c9b2899c83 Merge pull request #135 from louis-e/dependabot/cargo/dirs-5.0.1
Update dirs requirement from 4.0.0 to 5.0.1
2025-01-04 22:02:25 +01:00
Louis Erbkamm
155e3e5a9b Merge pull request #158 from adamperkowski/fix/cargolock
fix: include `Cargo.lock`
2025-01-04 17:31:43 +01:00
Adam Perkowski
d364ed1361 fix: include Cargo.lock 2025-01-04 15:33:04 +01:00
Louis Erbkamm
2f2d1c79bb Merge pull request #155 from louis-e/scale-adaption
Adapted minimum scale value to 0.3
2025-01-04 15:19:29 +01:00
Louis Erbkamm
54313019af Added new todos 2025-01-04 15:02:12 +01:00
louis-e
1bd3fb6802 Adapted minimum scale value to 0.3 2025-01-04 14:58:25 +01:00
louis-e
5cbeeb0e01 Adapted minimum scale value to 0.3 2025-01-04 14:57:57 +01:00
Louis Erbkamm
55b522764d Update bug_report.md 2025-01-04 14:46:10 +01:00
Louis Erbkamm
e2fd24ba08 Added bbox example to issue template 2025-01-04 14:24:34 +01:00
Louis Erbkamm
b095c40285 Update README.md 2025-01-04 14:21:16 +01:00
Louis Erbkamm
ffd5a274b0 Merge pull request #127 from benjamin051000/main
Change rfd features to enable manual builds on Linux.
2025-01-03 20:42:42 +01:00
Louis Erbkamm
0097e3b834 Update README.md 2025-01-03 20:38:25 +01:00
Louis Erbkamm
b37aa8185b Merge pull request #138 from louis-e/sign-implementation
Added set_sign in world_editor.rs
2025-01-03 20:25:47 +01:00
louis-e
11c1c18188 CI (clippy) fix: Added set_sign in world_editor.rs 2025-01-03 20:14:02 +01:00
louis-e
6200d4d6ef Added set_sign in world_editor.rs 2025-01-03 20:08:48 +01:00
Louis Erbkamm
2afd508d67 Merge pull request #136 from louis-e/generation-custom-dir
Enable generation without having Minecraft installed
2025-01-03 18:02:00 +01:00
louis-e
62a5a85625 CI (fmt) fix: Enable generation without having Minecraft installed 2025-01-03 17:27:44 +01:00
louis-e
36a17afd9f Enable generation without having Minecraft installed 2025-01-03 17:24:32 +01:00
dependabot[bot]
7c211938f7 Update dirs requirement from 4.0.0 to 5.0.1
---
updated-dependencies:
- dependency-name: dirs
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-01-03 16:05:44 +00:00
dependabot[bot]
3aa66407be Update geo requirement from 0.28.0 to 0.29.3
Updates the requirements on [geo](https://github.com/georust/geo) to permit the latest version.
- [Changelog](https://github.com/georust/geo/blob/main/CHANGES.md)
- [Commits](https://github.com/georust/geo/compare/geo-0.28.0...geo-0.29.3)

---
updated-dependencies:
- dependency-name: geo
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-01-03 16:04:58 +00:00
dependabot[bot]
18f1239215 Update itertools requirement from 0.13.0 to 0.14.0
Updates the requirements on [itertools](https://github.com/rust-itertools/itertools) to permit the latest version.
- [Changelog](https://github.com/rust-itertools/itertools/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-itertools/itertools/compare/v0.13.0...v0.14.0)

---
updated-dependencies:
- dependency-name: itertools
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-01-03 16:03:59 +00:00
Louis Erbkamm
f9d7600839 Merge pull request #123 from sebastiaanspeck/add-dependabot
Add dependabot for automatic dependency updates
2025-01-03 17:03:03 +01:00
Benjamin Wheeler
1bee90889c Change rfd features to enable manual builds on Linux.
rfd wasn't building on Linux, since its default features appear to be
for Windows. This commit changes them to work on Linux. TODO test on
Windows.
2025-01-03 10:40:02 -05:00
Louis Erbkamm
ecead36496 Merge pull request #105 from louis-e/longitude-wrapping-fix
Fixed longitude wrapping bug
2025-01-03 16:35:39 +01:00
louis-e
13a48105fe Removed obsolete console log 2025-01-03 16:06:11 +01:00
Sebastiaan Speck
07fdcf7bed Add dependabot for automatic dependency updates 2025-01-03 05:03:19 +01:00
Adam Perkowski
8e29b1422e docs(README): add Arch Linux installation instructions 2025-01-01 18:17:26 +01:00
Louis Erbkamm
aae99417dd Update README.md 2025-01-01 00:50:40 +01:00
louis-e
f4e0b66245 Fixed longitude wrapping bug 2024-12-31 12:14:18 +01:00
Louis Erbkamm
a99dd0f907 Updated version 2024-12-30 00:28:03 +01:00
Louis Erbkamm
5b023fc9ce Updated version 2024-12-30 00:27:51 +01:00
Louis Erbkamm
ed57bf1b4e Update README.md 2024-12-30 00:16:13 +01:00
Louis Erbkamm
1f45100707 Merge pull request #100 from louis-e/groundlevel-parameter
Added groundlevel parameter to settings
2024-12-30 00:05:32 +01:00
Louis Erbkamm
aa1c8509a5 Merge branch 'main' into groundlevel-parameter 2024-12-29 23:54:04 +01:00
louis-e
6193a05be7 fmt (clippy): fixed redundant field names in struct initialization 2024-12-29 23:53:33 +01:00
louis-e
b9277e6a60 Added groundlevel parameter to settings 2024-12-29 23:48:17 +01:00
Louis Erbkamm
5ae8c27bfa Merge pull request #98 from louis-e/new-world-generation
Added support for generating new world
2024-12-29 23:28:04 +01:00
Louis Erbkamm
0f47fa1316 Update README.md 2024-12-29 23:20:23 +01:00
louis-e
04c0b5e6f8 fmt (clippy): Removed unneeded return statement required by clippy 2024-12-29 23:17:59 +01:00
louis-e
c339f02d1b fmt (clippy): Removed unneeded return statement required by clippy 2024-12-29 23:02:19 +01:00
louis-e
e2e69d119f fmt: Fixed cargo fmt required formatting 2024-12-29 22:58:05 +01:00
Louis Erbkamm
278c7a2cda Extended bug_report.md 2024-12-29 22:56:47 +01:00
louis-e
fb31cb5a21 Added LastPlayed unix timestamp modification 2024-12-29 22:52:15 +01:00
louis-e
712c7db03e Added support for generating new world 2024-12-29 22:42:53 +01:00
Louis Erbkamm
420852fcb0 Added rotate maps to TODO section 2024-12-29 15:15:23 +01:00
Louis Erbkamm
a3aae00ae0 Updated star history section 2024-12-29 01:23:01 +01:00
Louis Erbkamm
7401036675 Merge pull request #95 from louis-e/floodfill-settings
Add floodfill timeout support
2024-12-29 00:55:24 +01:00
Louis Erbkamm
46cf1bca63 FUNDING.yml 2024-12-29 00:53:10 +01:00
louis-e
ae3a91970f Add floodfill timeout support 2024-12-29 00:41:20 +01:00
Louis Erbkamm
b44b7995d1 Merge pull request #94 from louis-e/session-lock-check
Check session lock before selecting world
2024-12-28 23:55:38 +01:00
louis-e
f3ae449f02 Check session lock before selecting world 2024-12-28 23:41:45 +01:00
Louis Erbkamm
2e319d5ea0 Merge pull request #93 from louis-e/snow-mode
Added winter mode
2024-12-28 23:34:29 +01:00
louis-e
1a259d6dfc Added winter mode 2024-12-28 23:22:07 +01:00
Louis Erbkamm
036e54807e Merge pull request #92 from louis-e/force-dark-theme
Force dark theme
2024-12-28 16:24:13 +01:00
louis-e
a75cffd94b Force dark theme 2024-12-28 16:21:35 +01:00
Louis Erbkamm
135e15077a Merge pull request #91 from louis-e/settings-menu
Added settings menu including scale option and custom bbox input
2024-12-28 03:20:45 +01:00
louis-e
a284f77545 Added settings menu including scale option and custom bbox input 2024-12-28 03:07:47 +01:00
Louis Erbkamm
5cb749ba8f Added .gitattributes 2024-12-25 01:50:30 +01:00
louis-e
b13f8cb96a Added capabilities/ 2024-12-25 01:42:08 +01:00
Louis Erbkamm
5121f3b647 Merge pull request #89 from louis-e/gui-impl
Implemented GUI
2024-12-25 00:52:01 +01:00
louis-e
5a215c1eda ci: remove Ubuntu build from CI workflow due to https://github.com/tauri-apps/tauri/issues/11222 2024-12-25 00:40:56 +01:00
louis-e
fbe40a0611 fix(ci): install libsoup3 and set PKG_CONFIG_PATH to resolve build issues on Ubuntu 2024-12-25 00:38:44 +01:00
louis-e
cab154e631 fix(ci): explicitly add universe and backports repositories to resolve dependency issues 2024-12-25 00:37:46 +01:00
louis-e
5a1d2024f3 fix(ci): resolve libsoup3-dev installation issue by adding universe repository and fallback to source build 2024-12-25 00:36:21 +01:00
louis-e
3c29f3d2a0 fix(ci): resolve gdk-sys build failure on Ubuntu by installing GTK dependencies 2024-12-25 00:32:32 +01:00
louis-e
0f0115f6bc fix(ci): install libsoup3 and set PKG_CONFIG_PATH to resolve build issues on Ubuntu 2024-12-25 00:31:01 +01:00
louis-e
36af3ad79d fix(ci): resolve gdk-sys build failure on Ubuntu by installing GTK dependencies 2024-12-25 00:22:33 +01:00
louis-e
4685a7297c Implemented GUI 2024-12-25 00:08:04 +01:00
Louis Erbkamm
28800b2fc2 Add files via upload 2024-12-24 23:14:23 +01:00
Louis Erbkamm
7c62da68b3 Merge pull request #84 from louis-e/region_file_fix
Fix region file creation and template writing in create_region function
2024-11-02 16:57:46 +01:00
louis-e
e578e5da6e Added truncate 2024-11-02 16:47:47 +01:00
louis-e
8293df44d4 Fix region file creation and template writing in create_region function
- Added `.create(true)` to `File::options()` in `create_region` to ensure the region file is created if it doesn't exist, resolving "file not found" error.
- Replaced `std::fs::copy` with `include_bytes!` macro for in-memory access to `region.template`, simplifying file handling and improving performance.

These changes ensure smoother file creation and handling during world generation.
2024-11-02 16:42:28 +01:00
Louis Erbkamm
8aa2f2b76e Merge pull request #81 from scd31/dont_download_template_region
Don't download region.template from github
2024-11-02 13:35:19 +01:00
Louis Erbkamm
8947b93f2f Fix borrowing CI error 2024-11-02 13:26:29 +01:00
Louis Erbkamm
bc9590ab0d Merge branch 'main' into dont_download_template_region 2024-11-02 13:22:21 +01:00
Louis Erbkamm
7ef7950bcb Merge pull request #80 from scd31/clippy_fixes
Clippy fixes
2024-11-02 13:18:57 +01:00
Louis Erbkamm
25e4b17d32 Merge pull request #83 from scd31/world_format_bugfix
revert a small world change
2024-11-02 13:17:55 +01:00
Stephen D
2068c1aa92 revert a small world change 2024-10-27 21:17:17 -03:00
Stephen D
31fe15becb fix remaining clippys 2024-10-27 11:36:21 -03:00
Stephen D
4b9f9f7d98 add rustfmt to CI 2024-10-27 11:25:57 -03:00
Stephen D
aa68f40170 cargo fmt the project 2024-10-27 11:25:56 -03:00
Stephen D
a394f40659 run clippy lints in CI 2024-10-27 11:24:56 -03:00
Stephen D
4d4ae69a9e fix clippy lints 2024-10-27 11:24:55 -03:00
Louis Erbkamm
7decd3765f Merge pull request #82 from scd31/thicc_world
Raise the world
2024-10-27 13:09:06 +01:00
Louis Erbkamm
fe2ee73166 Merge pull request #79 from scd31/world_scale
allow custom world scales
2024-10-27 12:53:03 +01:00
Louis Erbkamm
c71fced60d Merge pull request #78 from scd31/memeory_improvements
Memory improvements
2024-10-27 12:52:12 +01:00
Louis Erbkamm
0e53b185dc Merge pull request #77 from scd31/river_perf_improvements
river performance improvements
2024-10-27 12:49:42 +01:00
Stephen D
1200e8c32d raise up world 2024-10-25 12:47:09 -03:00
Stephen D
4aea786cd4 make minecraft recompute light levels for us 2024-10-24 22:30:17 -03:00
Stephen D
c9c0cb2f2c rivers 2024-10-24 19:24:40 -03:00
Stephen D
18de6ec808 very beginnings of elevation. Using a sinewave map and not everything has been moved onto the surface yet. Also, some things need better logic when placed on the surface (buildings go underground a bit) 2024-10-24 19:24:39 -03:00
Stephen D
9f521489ab raise up world 2024-10-23 22:07:53 -03:00
Stephen D
e5dba4dfbe speed up world saving significantly 2024-10-23 21:44:09 -03:00
Stephen D
5edda1bd7e Don't download region.template from github 2024-10-20 22:30:14 -03:00
Stephen D
c3e7765852 allow custom world scales 2024-10-20 21:16:41 -03:00
Stephen D
c89b9e4941 improve memory usage 2024-10-20 19:34:30 -03:00
Stephen D
dc29108b06 missed a file 2024-10-20 12:50:22 -03:00
Stephen D
78a747a618 river performance improvements 2024-10-20 12:45:40 -03:00
Louis Erbkamm
b727e85f65 Update contributors section in README.md
Added new contributors and removed contributors from the old legacy Python version of the project since they're already mentioned in the according legacy branch
2024-10-19 20:05:33 +02:00
Louis Erbkamm
85ef56cf32 Update contributors section in README.md
Added new contributors and removed contributors from the old legacy Python version of the project since they're already mentioned in the according legacy branch
2024-10-19 20:04:44 +02:00
Louis Erbkamm
14c649963e Merge pull request #76 from scd31/wide_rivers
Wide rivers
2024-10-19 20:00:08 +02:00
Louis Erbkamm
d79593d1c8 Merge pull request #74 from scd31/world_format_fix
fix chunk file in wrong location
2024-10-19 19:55:47 +02:00
Stephen D
839260407b working river generation! Very slow; still have to optimize 2024-10-19 12:19:35 -03:00
Stephen D
13cae5c910 refactor in preparation of river processing 2024-10-18 20:05:35 -03:00
Stephen D
53a62d0150 make north point north 2024-10-17 19:15:16 -03:00
Stephen D
ce17ec3267 fix loading bar 2024-10-16 19:25:01 -03:00
Stephen D
7deb31d898 code cleanup 2024-10-16 19:04:18 -03:00
Stephen D
9b23b62ffe fix bug when computing chunk pos for cities larger than a single region file 2024-10-15 22:43:06 -03:00
Stephen D
8034bd7824 fix chunk file in wrong location 2024-10-15 22:34:41 -03:00
Louis Erbkamm
6d68afd726 Merge pull request #73 from scd31/negative_bbox
Allow hyphen at start of bbox argument
2024-10-14 16:14:55 +02:00
Stephen D
010a7f73f2 allow hyphen at start of bbox argument 2024-10-13 13:40:55 -03:00
Louis Erbkamm
e0cecfdb8d Merge pull request #71 from vfosnar/main
another round of my improvements
2024-09-29 21:59:06 +02:00
Vojtěch Fošnár
5a69850967 enable lto 2024-09-23 20:08:49 +02:00
Vojtěch Fošnár
dfc9dada46 finish color implementation 2024-09-23 20:01:25 +02:00
Vojtěch Fošnár
569f408a07 simple surface for playground/pitch 2024-09-23 19:05:49 +02:00
Vojtěch Fošnár
0ca289d2df start of better wall and roof color implementation 2024-09-23 18:56:18 +02:00
Vojtěch Fošnár
5fa09131e3 implement floodfill timeout 2024-09-23 13:12:40 +02:00
Louis Erbkamm
38aa80b707 Merge pull request #69 from vfosnar/main
- Respect building:colour and roof:colour - get_block_for_color
- Fix parsing height for values containing m suffix
- Raise height calculation from levels * 3 to levels * 4
- Offset floors by 2 to match with the windows
- Simple information=board implementation
2024-09-22 22:31:21 +02:00
Vojtěch Fošnár
d512da2267 offset floors by 2, simple information=board impl 2024-09-22 19:23:39 +02:00
Vojtěch Fošnár
cc92ac42d2 fix parsing height with meters suffix 2024-09-22 15:08:35 +02:00
Vojtěch Fošnár
50213a185e add flake.nix and direnv to support development on NixOS, respect building:colour and roof:colour 2024-09-22 14:52:07 +02:00
Louis Erbkamm
96ad9ebd34 Fixed Issue #65 (Buildings over roads) 2024-09-22 11:42:37 +02:00
Louis Erbkamm
0d48f60c2f Merge pull request #64 from louis-e/api-error-handling
Graceful handling of API request errors
2024-09-21 19:23:32 +02:00
louis-e
755583d540 Graceful handling of API request errors 2024-09-21 19:18:24 +02:00
Louis Erbkamm
1056b89660 Removed survey 2024-09-21 03:02:16 +02:00
Louis Erbkamm
73011560a7 Fixed REMOTE_CARGO_TOML_URL const url 2024-09-21 01:35:07 +02:00
Louis Erbkamm
00ab57e1ea Update Cargo.toml 2024-09-20 19:38:31 +02:00
Louis Erbkamm
0ff31781fb Fixed Rust release workflow 2024-09-20 19:38:10 +02:00
Louis Erbkamm
f8bf0c02dd Added reference to releases in README 2024-09-20 19:31:56 +02:00
Louis Erbkamm
89135b8ddd Fixed Rust release workflow 2024-09-20 19:26:32 +02:00
Louis Erbkamm
543c1e551d Update Cargo.toml 2024-09-20 19:15:15 +02:00
Louis Erbkamm
7a17524de9 Fixed Rust release workflow 2024-09-20 19:13:03 +02:00
Louis Erbkamm
444c6f2d50 Fixed region.template download path 2024-09-20 19:02:30 +02:00
Louis Erbkamm
122c5f01a9 Updated README 2024-09-20 18:18:26 +02:00
louis-e
851c46b86d Merge experimental-rust-dev into main, resolve conflicts 2024-09-20 18:14:03 +02:00
Louis Erbkamm
8552b412e6 Merge pull request #59 from louis-e/prepare-rust-release
Prepare rust release
2024-09-20 18:03:09 +02:00
louis-e
f48598e1bc Prepare rust release 2024-09-20 18:01:43 +02:00
Louis Erbkamm
45ace99a9e Merge pull request #58 from louis-e/minor-fixes
Minor optimization
2024-09-18 20:22:43 +02:00
louis-e
540b8db7d9 Minor optimization 2024-09-18 20:17:40 +02:00
Louis Erbkamm
023bd888f2 Merge pull request #57 from louis-e/lighting-fix
Fixed lighting levels (SkyLight)
2024-09-18 18:41:20 +02:00
louis-e
c237978ce9 Fixed lighting levels (SkyLight) 2024-09-18 18:40:31 +02:00
Louis Erbkamm
1b661c1619 Merge pull request #56 from louis-e/fix-overlay
Fixed overlay issue
2024-09-18 00:19:01 +02:00
louis-e
685df7caa0 Fixed overlay issue 2024-09-18 00:17:15 +02:00
Louis Erbkamm
15f4bf0345 Merge pull request #55 from louis-e/fix-properties
Fix block properties
2024-09-17 21:44:41 +02:00
louis-e
eee26aeda5 Fixed block properties 2024-09-17 21:43:28 +02:00
Louis Erbkamm
4cc432b699 Refactored height check 2024-09-16 21:32:57 +02:00
Louis Erbkamm
baa70a7f3c Update README.md 2024-09-16 21:03:27 +02:00
Louis Erbkamm
9e4f743778 Updated Git Assets 2024-09-16 20:48:01 +02:00
Louis Erbkamm
10bcfbfc8a Added Git Assets 2024-09-16 20:38:45 +02:00
Louis Erbkamm
385ee223e0 Merge pull request #54 from louis-e/third-port-bulk
Major third porting bulk
2024-09-15 22:56:41 +02:00
Louis Erbkamm
2b09c18ec9 Merge branch 'experimental-rust-dev' into third-port-bulk 2024-09-15 22:56:27 +02:00
louis-e
ee88e9dc47 Major third porting bulk 2024-09-15 22:52:19 +02:00
Louis Erbkamm
f9ce6f208c Create feature_request.md 2024-09-14 15:53:54 +02:00
Louis Erbkamm
83e1296ce9 Create discussion.md 2024-09-14 15:53:34 +02:00
Louis Erbkamm
72c8cdc3b7 Create bug_report.md 2024-09-14 15:52:53 +02:00
Louis Erbkamm
15837d5050 Added Release Workflow 2024-09-14 15:51:58 +02:00
Louis Erbkamm
53f352dad4 Update README.md 2024-09-11 21:05:18 +02:00
Louis Erbkamm
dbbb6a896a Update README.md 2024-09-11 21:04:31 +02:00
Louis Erbkamm
e9ca4789c0 Merge pull request #52 from louis-e/second-port-bulk
Fine tuning and bug fixing
2024-09-11 20:15:15 +02:00
louis-e
c3b7904286 Fine tuning and bug fixing 2024-09-11 20:13:52 +02:00
Louis Erbkamm
0b385197db Merge pull request #51 from louis-e/core-port-impl
Core feature port
2024-09-01 03:31:19 +02:00
Louis Erbkamm
77fe64c910 Delete Cargo.lock 2024-09-01 03:30:26 +02:00
louis-e
bfb4bdaf6c Core feature port 2024-09-01 03:22:59 +02:00
Louis Erbkamm
8d57da0cd7 Reverted accidental grass_block to grass 2024-08-30 22:02:24 +02:00
Louis Erbkamm
704736f9dd Enhanced modularization and core feature porting
Merge pull request #47 from louis-e/rust-modularization
2024-08-25 03:03:06 +02:00
louis-e
a7c1f7be5e Enhanced modularization and core feature porting
Modularization: Separated core logic into dedicated modules (world_editor, args, data_processing, block_definitions) for better maintainability.
Bresenham Algorithm: Implemented efficient block placement for drawing lines in 3D space.
Block Definitions: Centralized block constants for cleaner and reusable block references.
Input Argument Parsing: Integrated clap for robust command-line argument handling, including dynamic path and bounding box inputs.
File Structure: Refined file organization to support scalability and easier navigation.
2024-08-25 03:00:04 +02:00
Louis Erbkamm
1bdbf83d22 Added Support for Multi-Region Block Modifications and Cuboid Fill Functionality
Multi-Region Support: The editor now handles block modifications across multiple regions, dynamically loading and creating region files as needed.
Cuboid Fill Functionality: Adds a fill_blocks method to allow setting a block type across a defined 3D area, improving bulk modifications.
2024-08-25 01:18:44 +02:00
louis-e
478ffb6709 Initial branch setup 2024-08-24 16:37:06 +02:00
Louis Erbkamm
0d3565e351 Merge pull request #46 from Aeris1One/anvil-new
Upgrade to anvil-new
2024-08-24 15:56:10 +02:00
Louis Erbkamm
96c7d33cb8 Added pull_request trigger to workflow 2024-08-24 15:53:47 +02:00
Charles P.
e549ded318 Upgrade to anvil-new 2024-08-24 14:50:36 +02:00
Louis Erbkamm
2ad01f8298 Added validation for bbox input
Merge pull request #45 from louis-e/bbox-validation
2024-08-18 14:29:23 +02:00
louis-e
6f34b125bf flake8 and black reformatting 2024-08-18 14:28:14 +02:00
louis-e
1036e36c15 Added validation for bbox input 2024-08-18 14:25:04 +02:00
Louis Erbkamm
ee49015291 Update bug_report.md 2024-08-17 16:14:46 +02:00
Louis Erbkamm
121437cfbf Update issue templates
Added bug report, feature request and discussion
2024-08-16 17:31:33 +02:00
Louis Erbkamm
3bb459cdb7 Change license from MIT to GNU General Public License (GPL v3)
Merge pull request #41 from louis-e/license-switch
2024-08-16 17:15:25 +02:00
Louis Erbkamm
87bf75c161 Update LICENSE 2024-08-16 17:14:35 +02:00
louis-e
24bd642839 Updated README license information 2024-08-16 17:12:47 +02:00
166 changed files with 64406 additions and 2510 deletions

View File

@@ -1,5 +0,0 @@
[flake8]
ignore = E203, W503, F405, F403
# line length is intentionally set to 80 here because black uses Bugbear
# See https://black.readthedocs.io/en/stable/the_black_code_style/current_style.html#line-length for more details
max-line-length = 100

1
.gitattributes vendored Normal file
View File

@@ -0,0 +1 @@
gui-src/** linguist-vendored

1
.github/FUNDING.yml vendored Normal file
View File

@@ -0,0 +1 @@
buy_me_a_coffee: louisdev

View File

@@ -1,8 +1,8 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
title: "[BUG] Your title here"
labels: bug
assignees: ''
---
@@ -10,11 +10,14 @@ assignees: ''
**Describe the bug**
A clear and concise description of what the bug is and what you expected to happen.
**Used bbox parameter**
Please provide your input parameters so we can reproduce the issue.
**Used bbox area**
Please provide your input parameters so we can reproduce the issue. *(For example: 48.133444 11.569462 48.142609 11.584740)*
**Arnis and Minecraft version**
Please tell us what version of Arnis and Minecraft you used.
**Screenshots**
If applicable, add screenshots to help explain your problem.
**Additional context**
Add any other context about the problem here.
Add any other context about the problem here. If you used any more custom settings, please provide them here too. If you experienced any issue with the application itself like a crash, please provide the log file which can be found at C:\Users\USERNAME\AppData\Local\com.louisdev.arnis\logs

10
.github/ISSUE_TEMPLATE/discussion.md vendored Normal file
View File

@@ -0,0 +1,10 @@
---
name: Discusssion
about: Discuss a topic or change
title: "[DISCUSSION] Your title here"
labels: discussion
assignees: ''
---

View File

@@ -0,0 +1,17 @@
---
name: Feature request
about: Suggest an idea for this project
title: "[FEATURE] Your title here"
labels: feature
assignees: ''
---
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is.
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Additional context**
Add any other context or screenshots about the feature request here.

10
.github/dependabot.yml vendored Normal file
View File

@@ -0,0 +1,10 @@
version: 2
updates:
- package-ecosystem: "cargo"
directory: "/"
schedule:
interval: "monthly"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"

View File

@@ -1,45 +0,0 @@
name: Build and Release for Linux
on:
release:
types: [created] # Triggers only when a release is created
jobs:
build-and-release:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.10'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: Create Executable
uses: Martin005/pyinstaller-action@v1.2.0
with:
python_ver: '3.10'
spec: 'pyinst-compile.spec'
requirements: 'requirements.txt'
upload_exe_with_name: 'arnis'
options: '--onefile --name arnis'
- name: Build
run: make build
- name: Upload Release Asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ github.event.release.upload_url }}
asset_path: ./dist/arnis
asset_name: arnis
asset_content_type: application/octet-stream

View File

@@ -1,45 +0,0 @@
name: Build and Release for Windows
on:
release:
types: [created] # Triggers only when a release is created
jobs:
build-and-release:
runs-on: windows-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.10'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: Create Executable
uses: Martin005/pyinstaller-action@v1.2.0
with:
python_ver: '3.10'
spec: 'pyinst-compile.spec'
requirements: 'requirements.txt'
upload_exe_with_name: 'arnis.exe'
options: '--onefile --name arnis'
- name: Build
run: make build
- name: Upload Release Asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ github.event.release.upload_url }}
asset_path: ./dist/arnis.exe
asset_name: arnis.exe
asset_content_type: application/octet-stream

74
.github/workflows/ci-build.yml vendored Normal file
View File

@@ -0,0 +1,74 @@
name: CI Build
# Trigger CI on pull requests and pushes to main, when relevant files change
on:
pull_request:
branches:
- main
paths:
- 'src/**'
- 'Cargo.toml'
- 'Cargo.lock'
push:
branches:
- main
paths:
- 'src/**'
- 'Cargo.toml'
- 'Cargo.lock'
workflow_dispatch:
jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Set up Rust
uses: dtolnay/rust-toolchain@v1
with:
toolchain: stable
targets: ${{ matrix.os == 'windows-latest' && 'x86_64-pc-windows-msvc' || 'x86_64-unknown-linux-gnu' || 'x86_64-apple-darwin' }}
components: clippy
- name: Install Linux dependencies
if: matrix.os == 'ubuntu-latest'
run: |
sudo apt update
sudo apt install -y software-properties-common
sudo add-apt-repository universe
echo "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc)-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
sudo apt update
sudo apt install -y libgtk-3-dev build-essential pkg-config libglib2.0-dev libsoup-3.0-dev libwebkit2gtk-4.1-dev
echo "PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig" >> $GITHUB_ENV
- name: Set up cache for Cargo
uses: actions/cache@v3
with:
path: |
~/.cargo/registry
~/.cargo/git
target
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-cargo-
- name: Check formatting
run: cargo fmt -- --check
- name: Check clippy lints
run: cargo clippy --all-targets --all-features -- -D warnings
- name: Install Rust dependencies
run: cargo fetch
- name: Build (all targets, all features)
run: cargo build --all-targets --all-features --release
- name: Run unit tests
run: cargo test --all-targets --all-features

103
.github/workflows/pr-benchmark.yml vendored Normal file
View File

@@ -0,0 +1,103 @@
name: PR Benchmark
on:
pull_request:
types: [opened, reopened]
issue_comment:
types: [created]
jobs:
benchmark:
if: |
github.event_name == 'pull_request' ||
(github.event_name == 'issue_comment' &&
github.event.issue.pull_request != null &&
contains(github.event.comment.body, 'retrigger-benchmark'))
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Set up Rust
uses: dtolnay/rust-toolchain@v1
with:
toolchain: stable
components: clippy
- name: Create dummy Minecraft world directory
run: |
mkdir -p "./world/region"
- name: Start timer
id: start_time
run: echo "start_time=$(date +%s)" >> $GITHUB_OUTPUT
- name: Run benchmark command with memory tracking
id: benchmark
run: |
/usr/bin/time -v cargo run --release --no-default-features -- --path="./world" --terrain --bbox="48.117861,11.541996,48.154520,11.604824" 2> benchmark_log.txt
grep "Maximum resident set size" benchmark_log.txt | awk '{print $6}' > peak_mem_kb.txt
peak_kb=$(cat peak_mem_kb.txt)
peak_mb=$((peak_kb / 1024))
echo "peak_memory=${peak_mb}" >> $GITHUB_OUTPUT
- name: End timer and calculate duration
id: end_time
run: |
end_time=$(date +%s)
start_time=${{ steps.start_time.outputs.start_time }}
duration=$((end_time - start_time))
echo "duration=$duration" >> $GITHUB_OUTPUT
- name: Format duration and generate summary
id: comment_body
run: |
duration=${{ steps.end_time.outputs.duration }}
minutes=$((duration / 60))
seconds=$((duration % 60))
peak_mem=${{ steps.benchmark.outputs.peak_memory }}
baseline_time=130
diff=$((duration - baseline_time))
abs_diff=${diff#-}
if [ "$diff" -lt -10 ]; then
verdict="✅ This PR **improves generation time**."
elif [ "$abs_diff" -le 7 ]; then
verdict="🟢 Generation time is unchanged."
elif [ "$diff" -le 25 ]; then
verdict="⚠️ This PR **slightly worsens generation time**."
else
verdict="🚨 This PR **drastically worsens generation time**."
fi
baseline_mem=1960
mem_annotation=""
if [ "$peak_mem" -gt 2000 ]; then
mem_diff=$((peak_mem - baseline_mem))
mem_percent=$((mem_diff * 100 / baseline_mem))
mem_annotation=" (↗ ${mem_percent}% more)"
fi
{
echo "summary<<EOF"
echo "⏱️ Benchmark run finished in **${minutes}m ${seconds}s**"
echo "🧠 Peak memory usage: **${peak_mem} MB**${mem_annotation}"
echo ""
echo "📈 Compared against baseline: **${baseline_time}s**"
echo "🧮 Delta: **${diff}s**"
echo "🔢 Commit: [\`${GITHUB_SHA:0:7}\`](https://github.com/${GITHUB_REPOSITORY}/commit/${GITHUB_SHA})"
echo ""
echo "${verdict}"
echo ""
echo "_You can retrigger the benchmark by commenting \`retrigger-benchmark\`._"
echo "EOF"
} >> "$GITHUB_OUTPUT"
- name: Comment build time on PR
uses: thollander/actions-comment-pull-request@v3
with:
message: ${{ steps.comment_body.outputs.summary }}
comment-tag: benchmark-report
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

View File

@@ -0,0 +1,92 @@
name: [DISABLED] Pre-release Dev Build
on:
push:
branches:
- main
jobs:
build:
strategy:
matrix:
include:
- os: windows-latest
target: x86_64-pc-windows-msvc
binary_name: arnis.exe
asset_name: arnis-windows-x64.exe
- os: ubuntu-latest
target: x86_64-unknown-linux-gnu
binary_name: arnis
asset_name: arnis-linux-x64
runs-on: ${{ matrix.os }}
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Set up Rust
uses: dtolnay/rust-toolchain@v1
with:
toolchain: stable
targets: ${{ matrix.target }}
- name: Install Linux dependencies
if: matrix.os == 'ubuntu-latest'
run: |
sudo apt update
sudo apt install -y software-properties-common
sudo add-apt-repository universe
echo "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc)-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
sudo apt update
sudo apt install -y libgtk-3-dev build-essential pkg-config libglib2.0-dev libsoup-3.0-dev libwebkit2gtk-4.1-dev
echo "PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig" >> $GITHUB_ENV
- name: Install dependencies
run: cargo fetch --locked
- name: Build
run: cargo build --frozen --release
- name: Upload artifact
uses: actions/upload-artifact@v3
with:
name: ${{ matrix.os }}-build
path: target/release/${{ matrix.binary_name }}
prerelease:
needs: build
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Download Windows build artifact
uses: actions/download-artifact@v3
with:
name: windows-latest-build
path: ./builds/windows
- name: Download Linux build artifact
uses: actions/download-artifact@v3
with:
name: ubuntu-latest-build
path: ./builds/linux
- name: Make Linux binary executable
run: chmod +x ./builds/linux/arnis
- name: Create Pre-release on GitHub
uses: ncipollo/release-action@v1
with:
tag: "dev-build-${{ github.run_number }}"
name: "Experimental Development Build #${{ github.run_number }}"
body: "Automated pre-release built from the main branch for testing purposes. This build may contain experimental features. For the latest official version, please download the latest stable release."
draft: false
prerelease: true
makeLatest: false
files: |
builds/windows/arnis.exe
builds/linux/arnis
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

View File

@@ -1,32 +0,0 @@
# This workflow will install Python dependencies, run tests and lint with a single version of Python
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
# Reduced subset of file from https://github.com/actions/starter-workflows/blob/main/ci/python-app.yml
name: Python application
on: [push]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up Python 3.10
uses: actions/setup-python@v3
with:
python-version: '3.10'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install flake8 pytest black
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
- name: Check the black styling
run: |
make style-check
- name: Lint with flake8
run: |
make lint
- name: Run unit tests
run: |
python -m pytest

129
.github/workflows/release.yml vendored Normal file
View File

@@ -0,0 +1,129 @@
name: Build and Release Arnis
on:
release:
types: [created]
jobs:
build:
strategy:
matrix:
include:
- os: windows-latest
target: x86_64-pc-windows-msvc
binary_name: arnis.exe
asset_name: arnis-windows.exe
- os: ubuntu-latest
target: x86_64-unknown-linux-gnu
binary_name: arnis
asset_name: arnis-linux
- os: macos-latest
target: x86_64-apple-darwin
binary_name: arnis
asset_name: arnis-mac
runs-on: ${{ matrix.os }}
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Set up Rust
uses: dtolnay/rust-toolchain@v1
with:
toolchain: stable
targets: ${{ matrix.target }}
- name: Install Linux dependencies
if: matrix.os == 'ubuntu-latest'
run: |
sudo apt update
sudo apt install -y software-properties-common
sudo add-apt-repository universe
echo "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc)-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
sudo apt update
sudo apt install -y libgtk-3-dev build-essential pkg-config libglib2.0-dev libsoup-3.0-dev libwebkit2gtk-4.1-dev
echo "PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig" >> $GITHUB_ENV
- name: Install dependencies
run: cargo fetch
- name: Build
run: cargo build --release
- name: Rename binary for release
run: mv target/release/${{ matrix.binary_name }} target/release/${{ matrix.asset_name }}
- name: Install Windows SDK
if: matrix.os == 'windows-latest'
run: |
choco install windows-sdk-10.1 -y
$env:Path += ";C:\Program Files (x86)\Windows Kits\10\bin\x64"
shell: powershell
- name: Locate signtool.exe
if: matrix.os == 'windows-latest'
id: locate_signtool
run: |
$env:ProgramFilesX86 = [System.Environment]::GetFolderPath('ProgramFilesX86')
$signtoolPath = Get-ChildItem -Path "$env:ProgramFilesX86\Windows Kits\10\bin" -Recurse -Filter signtool.exe | Where-Object { $_.FullName -match '\\x64\\' } | Select-Object -First 1 -ExpandProperty FullName
if (-not $signtoolPath) { throw "signtool.exe not found." }
echo "signtool=$signtoolPath" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
shell: powershell
- name: Self-sign Windows executable
if: matrix.os == 'windows-latest'
run: |
$password = ConvertTo-SecureString -String $env:WINDOWS_CERT_PASSWORD -Force -AsPlainText
$cert = New-SelfSignedCertificate -Type CodeSigningCert -Subject 'CN=Arnis' -CertStoreLocation Cert:\CurrentUser\My -NotAfter (Get-Date).AddYears(5)
Export-PfxCertificate -Cert $cert -FilePath arnis-cert.pfx -Password $password
& $env:signtool sign /f arnis-cert.pfx /p $env:WINDOWS_CERT_PASSWORD /t http://timestamp.digicert.com target/release/${{ matrix.asset_name }}
env:
WINDOWS_CERT_PASSWORD: ${{ secrets.WINDOWS_CERT_PASSWORD }}
shell: powershell
- name: Upload artifact
uses: actions/upload-artifact@v3
with:
name: ${{ matrix.os }}-build
path: target/release/${{ matrix.asset_name }}
release:
needs: build
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Download Windows build artifact
uses: actions/download-artifact@v3
with:
name: windows-latest-build
path: ./builds/windows
- name: Download Linux build artifact
uses: actions/download-artifact@v3
with:
name: ubuntu-latest-build
path: ./builds/linux
- name: Download macOS build artifact
uses: actions/download-artifact@v3
with:
name: macos-latest-build
path: ./builds/macos
- name: Make Linux and macOS binaries executable
run: |
chmod +x ./builds/linux/arnis-linux
chmod +x ./builds/macos/arnis-mac
- name: Create GitHub Release
uses: softprops/action-gh-release@v1
with:
files: |
builds/windows/arnis-windows.exe
builds/linux/arnis-linux
builds/macos/arnis-mac
env:
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}

199
.gitignore vendored
View File

@@ -1,167 +1,48 @@
# Original file is from https://github.com/github/gitignore/blob/main/Python.gitignore
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class
# C extensions
*.so
# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST
# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec
# Installer logs
pip-log.txt
pip-delete-this-directory.txt
# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/
cover/
# Translations
*.mo
*.pot
# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal
# Flask stuff:
instance/
.webassets-cache
# Scrapy stuff:
.scrapy
# Sphinx documentation
docs/_build/
# PyBuilder
.pybuilder/
target/
# Jupyter Notebook
.ipynb_checkpoints
# IPython
profile_default/
ipython_config.py
# pyenv
# For a library or package, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# .python-version
# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock
# poetry
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
# This is especially recommended for binary packages to ensure reproducibility, and is more
# commonly ignored for libraries.
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
#poetry.lock
# pdm
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
#pdm.lock
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
# in version control.
# https://pdm.fming.dev/#use-with-ide
.pdm.toml
# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
__pypackages__/
# Celery stuff
celerybeat-schedule
celerybeat.pid
# SageMath parsed files
*.sage.py
# Environments
# Environment files
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/
.envrc
/.direnv
# Spyder project settings
.spyderproject
.spyproject
# Build artifacts
/target
**/*.rs.bk
# Rope project settings
.ropeproject
# IDE/editor files
.idea/
/.vscode/
/*.swp
*.iml
*.suo
*.ntvs*
*.njsproj
*.sln
*.ps1
# mkdocs documentation
/site
# System files
.DS_Store
Thumbs.db
*.tmp
*.log
# mypy
.mypy_cache/
.dmypy.json
dmypy.json
# Generated files
/export.json
/parsed_osm_data.txt
/elevation_debug.png
/gen/
/build/
*.rmeta
*.dSYM
# Pyre type checker
.pyre/
# Tauri specific
flake/
gen/
# pytype static type analyzer
.pytype/
# Miscellaneous
*.bak
*.old
*.orig
# Cython debug symbols
cython_debug/
# PyCharm
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/
# Debug files
arnis-debug-raw_data.json
arnis-debug-processed_data.json
arnis-debug-map.png
image.img
# Ignore all in flake directory except specific files
/flake/*
!/flake/flake.nix
!/flake/flake.lock

6730
Cargo.lock generated Normal file
View File

File diff suppressed because it is too large Load Diff

49
Cargo.toml Normal file
View File

@@ -0,0 +1,49 @@
[package]
name = "arnis"
version = "2.2.0"
edition = "2021"
description = "Arnis - Generate real life cities in Minecraft"
homepage = "https://github.com/louis-e/arnis"
repository = "https://github.com/louis-e/arnis"
license = "Apache-2.0"
readme = "README.md"
[profile.release]
lto = "thin"
[features]
default = ["gui"]
gui = ["tauri", "tauri-plugin-log", "tauri-plugin-shell", "tokio", "rfd", "dirs", "tauri-build"]
[build-dependencies]
tauri-build = {version = "2", optional = true}
[dependencies]
clap = { version = "4.1", features = ["derive"] }
colored = "3.0.0"
dirs = {version = "6.0.0", optional = true }
fastanvil = "0.31.0"
fastnbt = "2.5.0"
flate2 = "1.1"
fnv = "1.0.7"
fs2 = "0.4"
geo = "0.29.3"
image = "0.24"
indicatif = "0.17.8"
itertools = "0.14.0"
log = "0.4.27"
once_cell = "1.21.3"
rand = "0.8.5"
rayon = "1.10.0"
reqwest = { version = "0.12.7", features = ["blocking", "json"] }
rfd = { version = "0.15.1", optional = true }
semver = "1.0.23"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
tauri = { version = "2", optional = true }
tauri-plugin-log = { version = "2.2.2", optional = true }
tauri-plugin-shell = { version = "2", optional = true }
tokio = { version = "1.44.2", features = ["full"], optional = true }
[target.'cfg(windows)'.dependencies]
windows = { version = "0.61.1", features = ["Win32_System_Console"] }

View File

@@ -1,6 +0,0 @@
FROM python:3.9
RUN apt-get update && apt-get -y install git ffmpeg libsm6 libxext6
RUN cd /home && mkdir /home/region && git clone https://github.com/louis-e/arnis.git
WORKDIR /home/arnis
RUN pip install -r requirements.txt
ENTRYPOINT ["python", "arnis.py"]

214
LICENSE
View File

@@ -1,21 +1,201 @@
MIT License
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Copyright (c) 2022 Louis
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
1. Definitions.
The above copyright notice, the author ("louis-e") and this permission notice shall be included in all
copies or substantial portions of the Software.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

View File

@@ -1,11 +0,0 @@
# Check if black formatter will work without any rewrites, and produces an exit code
style-check:
black src/ --check
# This will reformat all python files unders bookdifferent/ into the python black standard
style:
black src/
# Checks that the python source files are compliant regarding errors and style conventions
lint:
flake8 src/

217
README.md
View File

@@ -1,137 +1,146 @@
<p align="center">
<img width="456" height="125" src="https://github.com/louis-e/arnis/blob/main/gitassets/logo.png?raw=true">
<img width="456" height="125" src="https://github.com/louis-e/arnis/blob/main/gui-src/images/logo.png?raw=true">
</p>
# Arnis [![Testing](https://github.com/louis-e/arnis/actions/workflows/python-app.yml/badge.svg)](https://github.com/louis-e/arnis/actions/workflows/python-app.yml)
This open source project generates any chosen location from the real world in Minecraft, allowing users to explore and build in a virtual world that mirrors the real one.
<br>
# Arnis [![CI Build Status](https://github.com/louis-e/arnis/actions/workflows/ci-build.yml/badge.svg)](https://github.com/louis-e/arnis/actions) [<img alt="GitHub Release" src="https://img.shields.io/github/v/release/louis-e/arnis" />](https://github.com/louis-e/arnis/releases) [<img alt="GitHub Downloads (all assets, all releases" src="https://img.shields.io/github/downloads/louis-e/arnis/total" />](https://github.com/louis-e/arnis/releases)
Arnis creates complex and accurate Minecraft Java Edition worlds that reflect real-world geography and architecture using OpenStreetMap.
###### ⚠️ This Github page is the official project website. Do not download Arnis from any other website.
## :desktop_computer: Example
![Minecraft World Demo](https://github.com/louis-e/arnis/blob/main/gitassets/demo-comp.png?raw=true)
![Minecraft World Demo Before After](https://github.com/louis-e/arnis/blob/main/gitassets/before-after.gif?raw=true)
![Minecraft Preview](https://github.com/louis-e/arnis/blob/main/gitassets/mc.gif?raw=true)
## :floppy_disk: How it works
![CLI Generation](https://github.com/louis-e/arnis/blob/main/gitassets/cli-generation.gif?raw=true)
The raw data obtained from the API *[(see FAQ)](#question-faq)* includes each element (buildings, walls, fountains, farmlands, etc.) with its respective corner coordinates (nodes) and descriptive tags. When you run the script, the following steps are performed automatically to generate a Minecraft world:
#### Processing Pipeline
1. Scraping Data from API: The script fetches geospatial data from the Overpass Turbo API.
2. Determine Coordinate Extremes: Identifies the highest and lowest latitude and longitude values from the dataset.
3. Standardize Coordinate Lengths: Ensures all coordinates are of uniform length and removes the decimal separator.
4. Normalize Data: Adjusts all coordinates to start from zero by subtracting the previously determined lowest values.
5. Parse Data: Transforms the raw data into a standardized structure.
6. Sort elements by priority: Enables a layering system with prioritized elements.
7. Optimize Array Size: Focuses on the outermost buildings to reduce array size.
8. Generate Minecraft World: Iterates through the array to create the Minecraft world, including 3D structures like forests, houses, and rivers.
Arnis is designed to handle large-scale data and generate rich, immersive environments that bring real-world cities, landmarks, and natural features into Minecraft. Whether you're looking to replicate your hometown, explore urban environments, or simply build something unique and realistic, Arnis generates your vision.
## :keyboard: Usage
```python3 arnis.py --bbox="min_lng,min_lat,max_lng,max_lat" --path="C:/Users/username/AppData/Roaming/.minecraft/saves/worldname"```
<img width="60%" src="https://github.com/louis-e/arnis/blob/main/gitassets/gui.png?raw=true"><br>
Download the [latest release](https://github.com/louis-e/arnis/releases/) or [compile](#trophy-open-source) the project on your own.
Choose your area using the rectangle tool and select your Minecraft world - then simply click on 'Start Generation'!
Use http://bboxfinder.com/ to draw a rectangle of your wanted area. Then copy the four box coordinates as shown below and use them as the input for the --bbox parameter.
![How to find area](https://github.com/louis-e/arnis/blob/main/gitassets/bbox-finder.png?raw=true)
The world will always be generated starting from the coordinates 0 0 0.
> The world will always be generated starting from the Minecraft coordinates 0 0 0 (/tp 0 0 0). This is the top left of your selected area.
Minecraft version 1.16.5 and below is currently not supported, but we are working on it! For the best results, use Minecraft version 1.21.4 or above.
If you choose to select an own world, be aware that Arnis will overwrite certain areas.
Manually generate a new Minecraft world (preferably a flat world) before running the script.
The --bbox parameter specifies the bounding box coordinates in the format: min_lng,min_lat,max_lng,max_lat.
Use --path to specify the location of the Minecraft world.
With the --timeout parameter you can set the timeout for the floodfill algorithm in seconds (default: 2).
You can optionally use the parameter --debug to see processed value outputs during runtime.
[[Arch Linux AUR package](https://aur.archlinux.org/packages/arnis)]
#### Experimental City/State/Country Input Method
The following method is experimental and may not perform as expected. Support is limited.
## :floppy_disk: How it works
![CLI Generation](https://github.com/louis-e/arnis/blob/main/gitassets/cli.gif?raw=true)
```python3 arnis.py --city="CityName" --state="StateName" --country="CountryName" --path="C:/Users/username/AppData/Roaming/.minecraft/saves/worldname"```
The raw data obtained from the API *[(see FAQ)](#question-faq)* includes each element (buildings, walls, fountains, farmlands, etc.) with its respective corner coordinates (nodes) and descriptive tags. When you run Arnis, the following steps are performed automatically to generate a Minecraft world:
### Docker image (experimental)
If you want to run this project containerized, you can use the Dockerfile provided in this repository. It will automatically scrape the latest source code from the repository. After running the container, you have to manually copy the generated region files from the container to the host machine in order to use them. When running the Docker image, set the ```--path``` parameter to ```/home```.
```
docker build -t arnis .
docker run arnis --city="Arnis" --state="Schleswig Holstein" --country="Deutschland" --path="/home"
docker cp CONTAINER_ID:/home/region DESTINATION_PATH
```
## :cd: Requirements
- Python 3
- ```pip install -r requirements.txt```
- To conform with style guide please format any changes and check the code quality
```black .```
```flake8 src/```
- Functionality should be covered by automated tests.
```python -m pytest```
#### Processing Pipeline
1. **Fetching Data from the Overpass API:** The script retrieves geospatial data for the desired bounding box from the Overpass API.
2. **Parsing Raw Data:** The raw data is parsed to extract essential information like nodes, ways, and relations. Nodes are converted into Minecraft coordinates, and relations are handled similarly to ways, ensuring all relevant elements are processed correctly. Relations and ways cluster several nodes into one specific object.
3. **Prioritizing and Sorting Elements:** The elements (nodes, ways, relations) are sorted by priority to establish a layering system, which ensures that certain types of elements (e.g., entrances and buildings) are generated in the correct order to avoid conflicts and overlapping structures.
4. **Generating Minecraft World:** The Minecraft world is generated using a series of element processors (generate_buildings, generate_highways, generate_landuse, etc.) that interpret the tags and nodes of each element to place the appropriate blocks in the Minecraft world. These processors handle the logic for creating 3D structures, roads, natural formations, and more, as specified by the processed data.
5. **Generating Ground Layer:** A ground layer is generated based on the provided scale factors to provide a base for the entire Minecraft world. This step ensures all areas have an appropriate foundation (e.g., grass and dirt layers).
6. **Saving the Minecraft World:** All the modified chunks are saved back to the Minecraft region files.
## :question: FAQ
- *Why do some cities take so long to generate?*<br>
The script's performance can be significantly affected by large elements, such as extensive farmlands. The floodfill algorithm can slow down considerably when dealing with such elements, leading to long processing times. Thus there is also a timeout restriction in place, which can be adjusted by the user *[(see Usage)](#keyboard-usage)*. It is recommended to start with smaller areas to get a sense of the script's performance. Continuous improvements on the algorithm especially focus on effiency improvements.
- *Wasn't this written in Python before?*<br>
Yes! Arnis was initially developed in Python, which benefited from Python's open-source friendliness and ease of readability. This is why we strive for clear, well-documented code in the Rust port of this project to find the right balance. I decided to port the project to Rust to learn more about the language and push the algorithm's performance further. We were nearing the limits of optimization in Python, and Rust's capabilities allow for even better performance and efficiency. The old Python implementation is still available in the python-legacy branch.
- *Where does the data come from?*<br>
The geographic data is sourced from OpenStreetMap (OSM)[^1], a free, collaborative mapping project that serves as an open-source alternative to commercial mapping services. The data is accessed via the Overpass API, which queries OSM's database.
The geographic data is sourced from OpenStreetMap (OSM)[^1], a free, collaborative mapping project that serves as an open-source alternative to commercial mapping services. The data is accessed via the Overpass API, which queries OSM's database. Other services like Google Maps do not provide data like this, which makes OSM perfect for this project.
- *How does the Minecraft world generation work?*<br>
The script uses the [anvil-parser](https://github.com/matcool/anvil-parser) library to interact with Minecraft's world format. This library allows the script to create and manipulate Minecraft region files, enabling the generation of real-world locations within the game.
The script uses the [fastnbt](https://github.com/owengage/fastnbt) cargo package to interact with Minecraft's world format. This library allows Arnis to manipulate Minecraft region files, enabling the generation of real-world locations. The section 'Processing Pipeline' goes a bit further into the details and steps of the generation process itself.
- *Where does the name come from?*<br>
The project is named after Arnis[^2], the smallest city in Germany. The city's small size made it an ideal test case for developing and debugging the script efficiently.
The project is named after the smallest city in Germany, Arnis[^2]. The city's small size made it an ideal test case for developing and debugging the algorithm efficiently.
- *I don't have Minecraft installed but want to generate a world for my kids. How?*<br>
When selecting a world, click on 'Select existing world' and choose a directory. The world will be generated there.
- *Arnis instantly closes again or the window is empty!*<br>
If you're on Windows, please install the [Evergreen Bootstrapper from Microsoft](https://developer.microsoft.com/en-us/microsoft-edge/webview2/?form=MA13LH#download).
## :memo: ToDo
Feel free to choose an item from the To-Do or Known Bugs list, or bring your own idea to the table. Contributions from everyone are welcome and encouraged to help improve this project.
- [ ] Look into https://github.com/Intergalactyc/anvil-new which seems to have a better support
- [ ] Tool for mapping real coordinates to Minecraft coordinates
- [ ] Fix railway orientation
- [ ] Fix gaps in bridges
- [ ] Full refactoring of variable and function names, establish naming conventions
- [ ] Detection of wrong bbox input
- [ ] Evaluate and implement multiprocessing in the ground layer initialization and floodfill algorithm
- [ ] Implement elevation
If you're on Linux, your system might be missing the webkit2gtk-4.1 library, install the corresponding package using your distro's package manager.
- *What Minecraft version should I use?*<br>
Please use Minecraft version 1.21.4 for the best results. Minecraft version 1.16.5 and below is currently not supported, but we are working on it!
- *The generation did finish, but there's nothing in the world!*<br>
Make sure to teleport to the generation starting point (/tp 0 0 0). If there is still nothing, you might need to travel a bit further into the positive X and positive Z direction.
- *What features are in the world generation settings?*<br>
**Terrain:** Make sure to enable this feature to generate your world with elevation data included.<br>
**Scale Factor:** The scale factor determines the size of the generated world.<br>
**Custom BBOX Input:** This setting allows you to manually input the bounding box coordinates for the area you want to generate.<br>
**Floodfill-Timeout (Sec):** This setting determines the maximum time the floodfill algorithm is allowed to run before being terminated. Increasing this value may improve the generation of large water areas but may also increase processing time.<br>
**Ground Height:** This setting determines the base height of the generated world and can be adjusted to create different terrain types.
## :memo: ToDo and Known Bugs
Feel free to choose an item from the To-Do or Known Bugs list, or bring your own idea to the table. Bug reports shall be raised as a Github issue. Contributions are highly welcome and appreciated!
- [ ] Fix compilation for Linux and Mac
- [ ] Fix coastal cities generation duration time (water_areas.rs)
- [ ] Rotate maps (https://github.com/louis-e/arnis/issues/97)
- [ ] Add support for older Minecraft versions (<=1.16.5) (https://github.com/louis-e/arnis/issues/124, https://github.com/louis-e/arnis/issues/137)
- [ ] Mapping real coordinates to Minecraft coordinates (https://github.com/louis-e/arnis/issues/29)
- [ ] Add interior to buildings
- [ ] Save fountain structure in the code (similar to the tree structure)
- [ ] Add windows to buildings
- [ ] Generate a few big cities using high performance hardware and make them available to download
- [ ] Optimize region file size
- [ ] Street markings
- [ ] Add better code comments
- [x] Alternative reliable city input options
- [x] Split up processData array into several smaller ones for big cities
- [x] Find alternative for CV2 package
- [x] Floodfill timeout parameter
- [x] Automated Tests
- [x] PEP8
- [x] Use f-Strings in print statements
- [x] Add Dockerfile
- [x] Added path check
- [x] Improve RAM usage
- [ ] Implement house roof types
- [ ] Add street names as signs
- [ ] Add support for inner attribute in multipolygons and multipolygon elements other than buildings
- [ ] Refactor bridges implementation
- [ ] Better code documentation
- [ ] Refactor fountain structure implementation
- [ ] Luanti Support (https://github.com/louis-e/arnis/issues/120)
- [ ] Minecraft Bedrock Edition Support (https://github.com/louis-e/arnis/issues/148)
- [x] Evaluate and implement elevation (https://github.com/louis-e/arnis/issues/66)
- [x] Refactor railway implementation
- [x] Evaluate and implement faster region saving
- [x] Support multipolygons (https://github.com/louis-e/arnis/issues/112, https://github.com/louis-e/arnis/issues/114)
- [x] Memory optimization
- [x] Fix Github Action Workflow for releasing MacOS Binary
- [x] Design and implement a GUI
- [x] Automatic new world creation instead of using an existing world
- [x] Fix faulty empty chunks ([https://github.com/owengage/fastnbt/issues/120](https://github.com/owengage/fastnbt/issues/120)) (workaround found)
- [x] Setup fork of [https://github.com/aaronr/bboxfinder.com](https://github.com/aaronr/bboxfinder.com) for easy bbox picking
## :bug: Known Bugs
- [ ] Docker image size
- [x] 'Noer' bug (occurs when several different digits appear in coordinates before the decimal point)
- [x] 'Nortorf' bug (occurs when there are several elements with a big distance to each other, e.g. the API returns several different cities with the exact same name)
- [x] Saving step memory overflow
- [x] Non uniform OSM naming standards (dashes) (See name tags at https://overpass-turbo.eu/s/1mMj)
## :trophy: Open Source
#### Key objectives of this project
- **Modularity**: Ensure that all components (e.g., data fetching, processing, and world generation) are cleanly separated into distinct modules for better maintainability and scalability.
- **Performance Optimization**: We aim to keep a good performance and speed of the world generation process.
- **Comprehensive Documentation**: Detailed in-code documentation for a clear structure and logic.
- **User-Friendly Experience**: Focus on making the project easy to use for end users.
- **Cross-Platform Support**: We want this project to run smoothly on Windows, macOS, and Linux.
## :trophy: Hall of Fame Contributors
This section is dedicated to recognizing and celebrating the outstanding contributions of individuals who have significantly enhanced this project. Your work and dedication are deeply appreciated!
#### How to contribute
This project is open source and welcomes contributions from everyone! Whether you're interested in fixing bugs, improving performance, adding new features, or enhancing documentation, your input is valuable. Simply fork the repository, make your changes, and submit a pull request. Please respect the above mentioned key objectives. Contributions of all levels are appreciated, and your efforts help improve this tool for everyone.
#### Contributors:
- callumfrance
- amir16yp
- EdwardWeir13579
- daniil2327
Build and run it using: ```cargo run --release --no-default-features -- --path="C:/YOUR_PATH/.minecraft/saves/worldname" --bbox="min_lng,min_lat,max_lng,max_lat"```<br>
For the GUI: ```cargo run --release```<br>
> You can use the parameter --debug to get a more detailed output of the processed values, which can be helpful for debugging and development.
After your pull request was merged, I will take care of regularly creating update releases which will include your changes.
## :star: Star History
[![Star History Chart](https://api.star-history.com/svg?repos=louis-e/arnis&type=Date)](https://star-history.com/#louis-e/arnis&Date)
<a href="https://star-history.com/#louis-e/arnis&Date">
<picture>
<source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=louis-e/arnis&Date&theme=dark" />
<source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=louis-e/arnis&Date&type=Date" />
<img alt="Star History Chart" src="https://api.star-history.com/svg?repos=louis-e/arnis&Date&type=Date" />
</picture>
</a>
## :copyright: License
MIT License[^3]
## :copyright: License Information
Copyright (c) 2022-2025 Louis Erbkamm (louis-e)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.[^3]
Download Arnis only from the official source (https://github.com/louis-e/arnis/). Every other website providing a download and claiming to be affiliated with the project is unofficial and may be malicious.
The logo was made by @nxfx21.
Copyright (c) 2022 louis-e
[^1]: https://en.wikipedia.org/wiki/OpenStreetMap
[^2]: https://en.wikipedia.org/wiki/Arnis,_Germany
[^3]:
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice, the author ("louis-e") and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
[^3]: https://github.com/louis-e/arnis/blob/main/LICENSE

View File

@@ -1,10 +0,0 @@
#!/usr/bin/env python
# Copyright 2022 by louis-e, https://github.com/louis-e/.
# MIT License
# Please see the LICENSE file that should have been included as part of this package.
from src.main import run
if __name__ == "__main__":
run()

4
build.rs Normal file
View File

@@ -0,0 +1,4 @@
fn main() {
#[cfg(feature = "gui")]
tauri_build::build()
}

10
capabilities/default.json Normal file
View File

@@ -0,0 +1,10 @@
{
"$schema": "../gen/schemas/desktop-schema.json",
"identifier": "default",
"description": "Capability for the main window",
"windows": ["main"],
"permissions": [
"core:default",
"shell:allow-open"
]
}

99
flake/flake.lock generated Normal file
View File

@@ -0,0 +1,99 @@
{
"nodes": {
"fenix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1724653830,
"narHash": "sha256-88f0KK8h6tGIP4Na5RJDKs0S+7WsGGaCGNkLj/bPV3g=",
"owner": "nix-community",
"repo": "fenix",
"rev": "9ecf5e7d800ace001320da8acadd4a3deb872a83",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1724479785,
"narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
"root": {
"inputs": {
"fenix": "fenix",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
}
},
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1724586512,
"narHash": "sha256-mrfwk6nO8N2WtCq3sB2zhd2QN1HMKzeSESzOA6lSsQg=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "7106cd3be50b2a43c1d9f2787bf22d4369c2b25b",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",
"version": 7
}

34
flake/flake.nix Normal file
View File

@@ -0,0 +1,34 @@
{
inputs = {
fenix = {
url = "github:nix-community/fenix";
inputs.nixpkgs.follows = "nixpkgs";
};
flake-utils.url = "github:numtide/flake-utils";
nixpkgs.url = "nixpkgs/nixos-unstable";
};
outputs = { self, fenix, flake-utils, nixpkgs }:
flake-utils.lib.eachDefaultSystem (system:
let
pkgs = nixpkgs.legacyPackages.${system};
fenixPkgs = (fenix.packages.${system}.stable);
in
{
devShell = pkgs.mkShell
{
buildInputs = with pkgs; [
openssl.dev
pkg-config
fenixPkgs.toolchain
wayland
glib
gdk-pixbuf
pango
gtk3
libsoup_3.dev
webkitgtk_4_1.dev
];
};
});
}

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 MiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 79 KiB

BIN
gitassets/cli.gif Normal file
View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 MiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

BIN
gitassets/gui.png Normal file
View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 198 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

BIN
gitassets/mc.gif Normal file
View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.7 MiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 MiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 MiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 MiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 MiB

15
gui-src/arnis.desktop vendored Normal file
View File

@@ -0,0 +1,15 @@
[Desktop Entry]
Type=Application
Name=Arnis
Comment=Generate cities from real life in Minecraft
Comment[lt]=Sugeneruokite tikrovės miestus „Minecraft“ žaidime
Comment[de]=Generiere echte Städte in Minecraft
Comment[fr]=Générez des villes réelles dans Minecraft
Comment[es]=Genera ciudades reales en Minecraft
Comment[pt]=Gere cidades reais no Minecraft
Comment[zh_CN]=在 Minecraft 中生成现实城市
Icon=icon
Exec=arnis
Categories=Game;Education;Geoscience
Keywords=OSM;OpenStreetMap;Minecraft
StartupWMClass=arnis

347
gui-src/css/bbox.css vendored Normal file
View File

@@ -0,0 +1,347 @@
html,
body,
#map {
height: 100%;
width: 100%;
padding: 0px;
margin: 0px;
font-family: "Courier New", Courier, monospace;
}
#info-box {
position: absolute;
width: 100%;
height: auto;
bottom: 0;
border: 0 0 7px 0;
z-index: 10000;
}
#coord-format {
position: absolute;
bottom: 0;
right: 15;
}
#coord-format .bboxlabel {
width: 100%;
}
#coord-format form {
margin-bottom: 10px;
}
#info img {
vertical-align: middle;
height: 16px;
width: auto;
opacity: 0.6;
}
#info img:hover {
opacity: 1;
cursor: pointer;
}
#info-toggle ul {
margin: 0 0 0 20px;
padding: 0;
}
#info-toggle ul li {
display: inline-block;
padding: 4px 7px 0;
background-color: rgba(230, 230, 230, 0.4);
border-top-left-radius: 3px;
border-top-right-radius: 3px;
font-weight: 900;
cursor: pointer;
}
#info-toggle ul li.active {
background-color: rgba(255, 255, 255, 0.8);
}
#info-toggle-button {
background-color: rgba(0, 0, 0, 0.7) !important;
color: #fff;
}
#info-toggle-button:hover {
background-color: #f4f4f4;
}
#projlabel,
#wgslabel {
display: inline-block;
color: #333;
z-index: 10000;
}
#projcoords {
display: none;
}
.coords {
text-align: left;
padding: 7px 0;
background-color: rgba(255, 255, 255, 0.8);
}
#bbounds,
#mbounds,
#mcenter {
font-size: small;
display: block;
z-index: 10000;
padding: 2px 0;
}
#mouse,
#tile,
#zoom {
display: inline-block;
}
.bboxlabel {
font-size: small;
font-weight: bold;
z-index: 10000;
background-color: black;
color: white;
text-align: center;
display: inline-block;
padding-left: 2px;
width: 60px;
}
.bboxllpos,
.bboxllpossmall,
.bboxprojpos,
.bboxprojpossmall,
.tilesmall,
.zoomsmall {
font-size: small;
font-weight: bold;
color: black;
display: inline-block;
padding-left: 5px;
}
.bboxllpos {
width: 350px;
}
.bboxllpossmall {
width: 200px;
}
.bboxprojpos {
width: 450px;
}
.bboxprojpossmall {
width: 250px;
}
.tilesmall {
width: 60px;
}
.zoomsmall {
width: 20px;
}
#map-ui-proj {
position: absolute;
top: 460px;
left: 10px;
list-style: none;
margin: 0;
padding: 0;
z-index: 100;
}
#map-ui-proj a {
font: normal 13px/18px 'Helvetica Neue', Helvetica, sans-serif;
background: #FFF;
color: #3C4E5A;
display: block;
margin: 0;
padding: 0;
border: 1px solid #BBB;
border-bottom-width: 0;
min-width: 75px;
padding: 2px;
text-decoration: none;
text-align: center;
}
#map-ui-proj a:hover {
background: #ECF5FA;
}
#map-ui-proj li:last-child a {
border-bottom-width: 1px;
-webkit-border-radius: 0 0 3px 3px;
border-radius: 0 0 3px 3px;
}
#map-ui-proj li:first-child a {
-webkit-border-radius: 3px 3px 0 0;
border-radius: 3px 3px 0 0;
}
#map-ui-proj a.active {
background: #3887BE;
border-color: #3887BE;
border-top-color: #FFF;
color: #FFF;
}
.epsglabel {
font-size: small;
font-weight: bold;
background-color: black;
color: white;
z-index: 10000;
}
#map-ui {
position: absolute;
top: 330px;
left: 12px;
list-style: none;
margin: 0;
padding: 0;
z-index: 100;
}
#map-ui a {
background-color: #fff;
border-bottom: 1px solid #ccc;
width: 30px;
height: 30px;
line-height: 30px;
display: block;
text-align: center;
text-decoration: none;
color: black;
background-image: url('css/maps/images/bbox-sprites.png');
background-repeat: no-repeat;
}
#map-ui a:hover {
background-color: #ECF5FA;
}
#map-ui li:last-child a {
border-bottom-width: 1px;
-webkit-border-radius: 0 0 3px 3px;
border-radius: 0 0 3px 3px;
background-position: -33px -2px;
}
#map-ui li:last-child a.enabled {
border-bottom-width: 1px;
-webkit-border-radius: 0 0 3px 3px;
border-radius: 0 0 3px 3px;
background-position: -278px -2px;
}
#map-ui li:first-child a {
-webkit-border-radius: 3px 3px 0 0;
border-radius: 3px 3px 0 0;
}
#create-geojson a.enabled {
background-position: -248px -2px;
}
#create-geojson a {
background-position: -2px -2px;
}
#geolocation a {
background-position: -186px -2px;
}
#geolocation a.active {
background-position: -63px -2px;
}
#help a.enabled {
background-position: -342px -2px;
}
#help a {
background-position: -93px -2px;
}
.zeroclipboard-is-hover {
opacity: 1 !important;
}
.leaflet-sidebar textarea {
/* display: none; */
height: 95%;
width: 100%;
border: 1;
padding: 2em;
resize: none;
-webkit-box-sizing: border-box;
/* Safari/Chrome, other WebKit */
-moz-box-sizing: border-box;
/* Firefox, other Gecko */
box-sizing: border-box;
/* Opera/IE 8+ */
}
.leaflet-sidebar button {
font-size: large;
}
.leaflet-sidebar .close {
z-index: 10001;
}
.ui-autocomplete {
max-height: 180px;
overflow-y: auto;
/* prevent horizontal scrollbar */
overflow-x: hidden;
}
/* IE 6 doesn't support max-height
* we use height instead, but this forces the menu to always be this tall
*/
* html .ui-autocomplete {
height: 180px;
}
.unblurred.leaflet-tile-loaded {
-moz-filter: blur(0) sepia(0) invert(0);
-webkit-filter: blur(0) sepia(0) invert(0);
filter: blur(0) sepia(0) invert(0);
-moz-transition: all 1s ease;
-webkit-transition: all 1s ease;
transition: all 1s ease;
}
.blurred.leaflet-tile-loaded {
-moz-filter: blur(1px) sepia(1) invert(1);
-moz-transition: all 1s ease;
-webkit-filter: blur(1px) sepia(1) invert(1);
-webkit-transition: all 1s ease;
filter: blur(1px) sepia(1) invert(1);
transition: all 1s ease;
}

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 418 B

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 312 B

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 205 B

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 262 B

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 348 B

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 207 B

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 278 B

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 328 B

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

View File

File diff suppressed because it is too large Load Diff

View File

File diff suppressed because one or more lines are too long

BIN
gui-src/css/maps/images/bbox-sprites.png vendored Normal file
View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

505
gui-src/css/maps/images/bbox-sprites.svg vendored Normal file
View File

@@ -0,0 +1,505 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Layer_1"
x="0px"
y="0px"
width="740"
height="60"
viewBox="0 0 740.00003 59.999999"
enable-background="new 0 0 100 100"
xml:space="preserve"
inkscape:version="0.48.2 r9819"
sodipodi:docname="bbox-sprites.svg"
inkscape:export-filename="/Users/aaronr/github/bboxfinder.com/css/maps/images/bbox-sprites.png"
inkscape:export-xdpi="45"
inkscape:export-ydpi="45"><metadata
id="metadata51"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
id="defs49"><inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 50 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="100 : 50 : 1"
inkscape:persp3d-origin="50 : 33.333333 : 1"
id="perspective5373" /></defs><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1226"
inkscape:window-height="844"
id="namedview47"
showgrid="true"
inkscape:zoom="1.32"
inkscape:cx="372.13373"
inkscape:cy="27.069218"
inkscape:window-x="8"
inkscape:window-y="1"
inkscape:window-maximized="0"
inkscape:current-layer="Layer_1"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
borderlayer="false"><inkscape:grid
type="xygrid"
id="grid6480"
empspacing="5"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true" /></sodipodi:namedview>
<g
id="g3285"
transform="matrix(0.84510875,0,0,0.84510875,2.4666349,3.9025275)"><path
inkscape:connector-curvature="0"
id="path3147"
d="m 19.02918,27.70898 0,-1.42397 1.52567,0 1.52569,0 0,-4.78047 0,-4.78046 -1.6274,0 -1.62738,0 0,1.52568 0,1.52568 -1.52567,0 -1.52569,0 0,-3.05136 0,-3.05135 7.83182,0 7.83182,0 0,3.05135 0,3.05136 -1.52569,0 -1.52567,0 0,-1.52568 0,-1.52568 -1.62739,0 -1.62739,0 0,4.78046 0,4.78047 1.52568,0 1.52567,0 0,1.42397 0,1.42396 -4.57703,0 -4.57704,0 0,-1.42396 z"
style="fill:#464646;fill-opacity:1;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none" /><path
inkscape:connector-curvature="0"
id="path3149"
d="m 19.64356,39.48975 0,-5.51027 1.35498,0 1.35497,0 0,4.15529 0,4.15527 12.64649,0 12.6465,0 0,-9.8462 0,-9.84619 -5.60059,0 -5.60059,0 0,-1.26465 0,-1.26465 6.95558,0 6.95556,0 0,12.46582 0,12.46583 L 35,45 l -15.35644,0 0,-5.51025 z"
style="fill:#464646;fill-opacity:1;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none" /></g><path
inkscape:connector-curvature="0"
id="path6172"
d=""
style="fill:#bbbbbb;fill-opacity:1;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none" /><path
inkscape:connector-curvature="0"
id="path6178"
d=""
style="fill:#bbbbbb;fill-opacity:1;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none" /><path
inkscape:connector-curvature="0"
id="path6184"
d=""
style="fill:#bbbbbb;fill-opacity:1;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none" /><path
inkscape:connector-curvature="0"
id="path6186"
d=""
style="fill:#bbbbbb;fill-opacity:1;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none" /><path
inkscape:connector-curvature="0"
id="path6270"
d=""
style="fill:#bbbbbb;fill-opacity:1;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none" /><path
inkscape:connector-curvature="0"
id="path6288"
d=""
style="fill:#bbbbbb;fill-opacity:1;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none" /><path
inkscape:connector-curvature="0"
id="path6682"
d=""
style="fill:#bbbbbb;fill-opacity:1;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none" /><path
inkscape:connector-curvature="0"
id="path6684"
d=""
style="fill:#bbbbbb;fill-opacity:1;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none" /><g
id="g3192"
transform="matrix(0.27873303,0,0,0.27873303,128.9627,14.868054)"
style="fill:#464646;fill-opacity:1">
<g
id="g3194"
style="fill:#464646;fill-opacity:1">
<rect
style="fill:#464646;fill-opacity:1;fill-rule:evenodd"
x="-114.388"
y="10.951"
clip-rule="evenodd"
width="20.32"
height="20.318001"
id="rect3196" />
<rect
style="fill:#464646;fill-opacity:1;fill-rule:evenodd"
x="-114.388"
y="36.349998"
clip-rule="evenodd"
width="20.32"
height="20.318001"
id="rect3198" />
<rect
style="fill:#464646;fill-opacity:1;fill-rule:evenodd"
x="-114.388"
y="61.748001"
clip-rule="evenodd"
width="20.32"
height="20.319"
id="rect3200" />
<rect
style="fill:#464646;fill-opacity:1;fill-rule:evenodd"
x="-139.785"
y="10.951"
clip-rule="evenodd"
width="20.318001"
height="20.318001"
id="rect3202" />
<rect
style="fill:#464646;fill-opacity:1;fill-rule:evenodd"
x="-139.785"
y="36.349998"
clip-rule="evenodd"
width="20.318001"
height="20.318001"
id="rect3204" />
<rect
style="fill:#464646;fill-opacity:1;fill-rule:evenodd"
x="-139.785"
y="61.748001"
clip-rule="evenodd"
width="20.318001"
height="20.319"
id="rect3206" />
<rect
style="fill:#464646;fill-opacity:1;fill-rule:evenodd"
x="-165.187"
y="10.951"
clip-rule="evenodd"
width="20.32"
height="20.318001"
id="rect3208" />
<rect
style="fill:#464646;fill-opacity:1;fill-rule:evenodd"
x="-165.187"
y="36.349998"
clip-rule="evenodd"
width="20.32"
height="20.318001"
id="rect3210" />
<rect
style="fill:#464646;fill-opacity:1;fill-rule:evenodd"
x="-165.187"
y="61.748001"
clip-rule="evenodd"
width="20.32"
height="20.319"
id="rect3212" />
</g>
<path
style="fill:#464646;fill-opacity:1;fill-rule:evenodd"
inkscape:connector-curvature="0"
clip-rule="evenodd"
d="m -175.144,0.991 v 90.855 h 91.032 V 0.991 h -91.032 z m 84.395,84.217 h -77.757 V 7.63 h 77.757 v 77.578 z"
id="path3214" />
</g><g
style="opacity:0.4;fill:#464646;fill-opacity:1"
transform="matrix(0.27657836,0,0,0.27657836,373.31286,14.597384)"
id="g3288">
<g
style="fill:#464646;fill-opacity:1"
id="g3290">
<rect
id="rect3292"
height="20.318001"
width="20.32"
clip-rule="evenodd"
y="10.951"
x="-114.388"
style="fill:#464646;fill-opacity:1;fill-rule:evenodd" />
<rect
id="rect3294"
height="20.318001"
width="20.32"
clip-rule="evenodd"
y="36.349998"
x="-114.388"
style="fill:#464646;fill-opacity:1;fill-rule:evenodd" />
<rect
id="rect3296"
height="20.319"
width="20.32"
clip-rule="evenodd"
y="61.748001"
x="-114.388"
style="fill:#464646;fill-opacity:1;fill-rule:evenodd" />
<rect
id="rect3298"
height="20.318001"
width="20.318001"
clip-rule="evenodd"
y="10.951"
x="-139.785"
style="fill:#464646;fill-opacity:1;fill-rule:evenodd" />
<rect
id="rect3300"
height="20.318001"
width="20.318001"
clip-rule="evenodd"
y="36.349998"
x="-139.785"
style="fill:#464646;fill-opacity:1;fill-rule:evenodd" />
<rect
id="rect3302"
height="20.319"
width="20.318001"
clip-rule="evenodd"
y="61.748001"
x="-139.785"
style="fill:#464646;fill-opacity:1;fill-rule:evenodd" />
<rect
id="rect3304"
height="20.318001"
width="20.32"
clip-rule="evenodd"
y="10.951"
x="-165.187"
style="fill:#464646;fill-opacity:1;fill-rule:evenodd" />
<rect
id="rect3306"
height="20.318001"
width="20.32"
clip-rule="evenodd"
y="36.349998"
x="-165.187"
style="fill:#464646;fill-opacity:1;fill-rule:evenodd" />
<rect
id="rect3308"
height="20.319"
width="20.32"
clip-rule="evenodd"
y="61.748001"
x="-165.187"
style="fill:#464646;fill-opacity:1;fill-rule:evenodd" />
</g>
<path
id="path3310"
d="m -175.144,0.991 v 90.855 h 91.032 V 0.991 h -91.032 z m 84.395,84.217 h -77.757 V 7.63 h 77.757 v 77.578 z"
clip-rule="evenodd"
inkscape:connector-curvature="0"
style="fill:#464646;fill-opacity:1;fill-rule:evenodd" />
</g><g
id="g3465"
transform="matrix(0.25404736,0,0,0.25404736,140.09745,14.744984)"
style="fill:#464646;fill-opacity:1"><g
id="g3451"
style="fill:#464646;fill-opacity:1">
<path
id="path3453"
d="m 28.793,71.207 c -5.062,-5.065 -7.6,-11.705 -7.62,-18.356 l -6.515,-0.002 c 0.021,8.32 3.193,16.635 9.526,22.967 6.335,6.331 14.647,9.504 22.967,9.526 L 47.15,78.827 C 40.5,78.806 33.856,76.268 28.793,71.207 z"
inkscape:connector-curvature="0"
style="fill:#464646;fill-opacity:1" />
<path
id="path3455"
d="M 18.423,81.575 C 10.501,73.654 6.535,63.251 6.514,52.85 L 0,52.846 c 0.02,12.074 4.623,24.145 13.815,33.34 9.193,9.188 21.261,13.796 33.337,13.812 V 93.483 C 36.745,93.467 26.346,89.495 18.423,81.575 z"
inkscape:connector-curvature="0"
style="fill:#464646;fill-opacity:1" />
</g><path
id="path3457"
d="M 76.157,43.675 73.294,43.334 C 77.075,38.692 76.803,31.847 72.475,27.523 68.154,23.196 61.309,22.924 56.664,26.705 L 56.325,23.843 32.482,0 11.531,20.949 l 23.842,23.843 2.864,0.341 c -3.779,4.643 -3.506,11.485 0.819,15.811 4.325,4.325 11.167,4.596 15.81,0.819 L 55.205,64.625 79.05,88.466 100,67.519 76.157,43.675 z M 38.384,38.586 20.749,20.949 32.482,9.218 l 17.637,17.636 0.669,5.64 -6.762,6.761 -5.642,-0.669 z M 79.05,79.249 61.412,61.613 l -0.668,-5.64 6.761,-6.761 5.642,0.668 17.633,17.639 -11.73,11.73 z"
inkscape:connector-curvature="0"
style="fill:#464646;fill-opacity:1" /></g><g
id="g4314"
transform="matrix(0.24999998,0,0,0.24999998,200.32251,15.25725)"
style="fill:#464646;fill-opacity:1"><path
id="path4302"
d="M 49.541,0 C 22.198,-0.019 0.027,22.376 0,49.978 0.027,77.621 22.198,100.01 49.541,100 76.894,100.011 99.064,77.621 99.085,49.979 99.064,22.376 76.894,-0.019 49.541,0 z m 0,88.483 C 28.503,88.483 11.445,71.252 11.462,49.971 11.441,28.742 28.503,11.514 49.541,11.52 70.589,11.514 87.65,28.742 87.673,49.978 87.65,71.251 70.589,88.483 49.541,88.483 z"
inkscape:connector-curvature="0"
style="fill:#464646;fill-opacity:1" /><path
id="path4304"
d="m 45.37,64.349 9.073,-0.041 v -7.015 c -0.023,-1.901 0.863,-3.704 3.242,-5.261 2.38,-1.563 9.016,-4.725 9.025,-13.061 C 66.7,30.67 59.73,24.955 53.868,23.72 48.014,22.529 41.665,23.324 37.169,28.281 c -4.042,4.396 -4.892,7.892 -4.905,15.603 h 9.07 v -1.799 c -0.014,-4.103 0.458,-8.438 6.312,-9.64 3.222,-0.631 6.226,0.375 8.018,2.103 2.024,2.007 2.042,6.496 -1.222,8.722 l -5.09,3.465 c -2.959,1.919 -3.977,4.038 -3.983,7.142 v 10.472 l 10e-4,0 z"
inkscape:connector-curvature="0"
style="fill:#464646;fill-opacity:1" /><polygon
id="polygon4306"
points="45.325,67.903 54.484,67.903 54.484,77.194 45.325,77.194 "
style="fill:#464646;fill-opacity:1" /></g><g
transform="matrix(0.84510875,0,0,0.84510875,246.47145,2.7863074)"
id="g4319"
style="opacity:0.4"><path
style="fill:#464646;fill-opacity:1;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none"
d="m 19.02918,27.70898 0,-1.42397 1.52567,0 1.52569,0 0,-4.78047 0,-4.78046 -1.6274,0 -1.62738,0 0,1.52568 0,1.52568 -1.52567,0 -1.52569,0 0,-3.05136 0,-3.05135 7.83182,0 7.83182,0 0,3.05135 0,3.05136 -1.52569,0 -1.52567,0 0,-1.52568 0,-1.52568 -1.62739,0 -1.62739,0 0,4.78046 0,4.78047 1.52568,0 1.52567,0 0,1.42397 0,1.42396 -4.57703,0 -4.57704,0 0,-1.42396 z"
id="path4321"
inkscape:connector-curvature="0" /><path
style="fill:#464646;fill-opacity:1;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none"
d="m 19.64356,39.48975 0,-5.51027 1.35498,0 1.35497,0 0,4.15529 0,4.15527 12.64649,0 12.6465,0 0,-9.8462 0,-9.84619 -5.60059,0 -5.60059,0 0,-1.26465 0,-1.26465 6.95558,0 6.95556,0 0,12.46582 0,12.46583 L 35,45 l -15.35644,0 0,-5.51025 z"
id="path4323"
inkscape:connector-curvature="0" /></g><g
style="opacity:0.4;fill:#464646;fill-opacity:1"
transform="matrix(0.24999998,0,0,0.24999998,445.38927,15.676751)"
id="g4325"><path
style="fill:#464646;fill-opacity:1"
inkscape:connector-curvature="0"
d="M 49.541,0 C 22.198,-0.019 0.027,22.376 0,49.978 0.027,77.621 22.198,100.01 49.541,100 76.894,100.011 99.064,77.621 99.085,49.979 99.064,22.376 76.894,-0.019 49.541,0 z m 0,88.483 C 28.503,88.483 11.445,71.252 11.462,49.971 11.441,28.742 28.503,11.514 49.541,11.52 70.589,11.514 87.65,28.742 87.673,49.978 87.65,71.251 70.589,88.483 49.541,88.483 z"
id="path4327" /><path
style="fill:#464646;fill-opacity:1"
inkscape:connector-curvature="0"
d="m 45.37,64.349 9.073,-0.041 v -7.015 c -0.023,-1.901 0.863,-3.704 3.242,-5.261 2.38,-1.563 9.016,-4.725 9.025,-13.061 C 66.7,30.67 59.73,24.955 53.868,23.72 48.014,22.529 41.665,23.324 37.169,28.281 c -4.042,4.396 -4.892,7.892 -4.905,15.603 h 9.07 v -1.799 c -0.014,-4.103 0.458,-8.438 6.312,-9.64 3.222,-0.631 6.226,0.375 8.018,2.103 2.024,2.007 2.042,6.496 -1.222,8.722 l -5.09,3.465 c -2.959,1.919 -3.977,4.038 -3.983,7.142 v 10.472 l 10e-4,0 z"
id="path4329" /><polygon
style="fill:#464646;fill-opacity:1"
points="45.325,67.903 54.484,67.903 54.484,77.194 45.325,77.194 "
id="polygon4331" /></g><g
style="opacity:0.4;fill:#464646;fill-opacity:1"
transform="matrix(0.25404736,0,0,0.25404736,384.37987,15.991112)"
id="g4333"><g
style="fill:#464646;fill-opacity:1"
id="g4335">
<path
style="fill:#464646;fill-opacity:1"
inkscape:connector-curvature="0"
d="m 28.793,71.207 c -5.062,-5.065 -7.6,-11.705 -7.62,-18.356 l -6.515,-0.002 c 0.021,8.32 3.193,16.635 9.526,22.967 6.335,6.331 14.647,9.504 22.967,9.526 L 47.15,78.827 C 40.5,78.806 33.856,76.268 28.793,71.207 z"
id="path4337" />
<path
style="fill:#464646;fill-opacity:1"
inkscape:connector-curvature="0"
d="M 18.423,81.575 C 10.501,73.654 6.535,63.251 6.514,52.85 L 0,52.846 c 0.02,12.074 4.623,24.145 13.815,33.34 9.193,9.188 21.261,13.796 33.337,13.812 V 93.483 C 36.745,93.467 26.346,89.495 18.423,81.575 z"
id="path4339" />
</g><path
style="fill:#464646;fill-opacity:1"
inkscape:connector-curvature="0"
d="M 76.157,43.675 73.294,43.334 C 77.075,38.692 76.803,31.847 72.475,27.523 68.154,23.196 61.309,22.924 56.664,26.705 L 56.325,23.843 32.482,0 11.531,20.949 l 23.842,23.843 2.864,0.341 c -3.779,4.643 -3.506,11.485 0.819,15.811 4.325,4.325 11.167,4.596 15.81,0.819 L 55.205,64.625 79.05,88.466 100,67.519 76.157,43.675 z M 38.384,38.586 20.749,20.949 32.482,9.218 l 17.637,17.636 0.669,5.64 -6.762,6.761 -5.642,-0.669 z M 79.05,79.249 61.412,61.613 l -0.668,-5.64 6.761,-6.761 5.642,0.668 17.633,17.639 -11.73,11.73 z"
id="path4341" /></g><rect
style="opacity:0.8;fill:#464646;fill-opacity:1;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none"
id="rect3039"
width="250.00003"
height="60"
x="490"
y="-1.7162162e-06" /><g
transform="matrix(0.84510875,0,0,0.84510875,492.46665,4.1596899)"
id="g3041"
style="fill:#ffffff"><path
style="fill:#ffffff;fill-opacity:1;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none"
d="m 19.02918,27.70898 0,-1.42397 1.52567,0 1.52569,0 0,-4.78047 0,-4.78046 -1.6274,0 -1.62738,0 0,1.52568 0,1.52568 -1.52567,0 -1.52569,0 0,-3.05136 0,-3.05135 7.83182,0 7.83182,0 0,3.05135 0,3.05136 -1.52569,0 -1.52567,0 0,-1.52568 0,-1.52568 -1.62739,0 -1.62739,0 0,4.78046 0,4.78047 1.52568,0 1.52567,0 0,1.42397 0,1.42396 -4.57703,0 -4.57704,0 0,-1.42396 z"
id="path3043"
inkscape:connector-curvature="0" /><path
style="fill:#ffffff;fill-opacity:1;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none"
d="m 19.64356,39.48975 0,-5.51027 1.35498,0 1.35497,0 0,4.15529 0,4.15527 12.64649,0 12.6465,0 0,-9.8462 0,-9.84619 -5.60059,0 -5.60059,0 0,-1.26465 0,-1.26465 6.95558,0 6.95556,0 0,12.46582 0,12.46583 L 35,45 l -15.35644,0 0,-5.51025 z"
id="path3045"
inkscape:connector-curvature="0" /></g><g
style="fill:#ffffff;fill-opacity:1"
transform="matrix(0.27873303,0,0,0.27873303,618.96272,15.125216)"
id="g3047">
<g
style="fill:#ffffff;fill-opacity:1"
id="g3049">
<rect
id="rect3051"
height="20.318001"
width="20.32"
clip-rule="evenodd"
y="10.951"
x="-114.388"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd" />
<rect
id="rect3053"
height="20.318001"
width="20.32"
clip-rule="evenodd"
y="36.349998"
x="-114.388"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd" />
<rect
id="rect3055"
height="20.319"
width="20.32"
clip-rule="evenodd"
y="61.748001"
x="-114.388"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd" />
<rect
id="rect3057"
height="20.318001"
width="20.318001"
clip-rule="evenodd"
y="10.951"
x="-139.785"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd" />
<rect
id="rect3059"
height="20.318001"
width="20.318001"
clip-rule="evenodd"
y="36.349998"
x="-139.785"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd" />
<rect
id="rect3061"
height="20.319"
width="20.318001"
clip-rule="evenodd"
y="61.748001"
x="-139.785"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd" />
<rect
id="rect3063"
height="20.318001"
width="20.32"
clip-rule="evenodd"
y="10.951"
x="-165.187"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd" />
<rect
id="rect3065"
height="20.318001"
width="20.32"
clip-rule="evenodd"
y="36.349998"
x="-165.187"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd" />
<rect
id="rect3067"
height="20.319"
width="20.32"
clip-rule="evenodd"
y="61.748001"
x="-165.187"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd" />
</g>
<path
id="path3069"
d="m -175.144,0.991 v 90.855 h 91.032 V 0.991 h -91.032 z m 84.395,84.217 h -77.757 V 7.63 h 77.757 v 77.578 z"
clip-rule="evenodd"
inkscape:connector-curvature="0"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd" />
</g><g
style="fill:#ffffff;fill-opacity:1"
transform="matrix(0.25404736,0,0,0.25404736,630.09747,15.002146)"
id="g3071"><g
style="fill:#ffffff;fill-opacity:1"
id="g3073">
<path
style="fill:#ffffff;fill-opacity:1"
inkscape:connector-curvature="0"
d="m 28.793,71.207 c -5.062,-5.065 -7.6,-11.705 -7.62,-18.356 l -6.515,-0.002 c 0.021,8.32 3.193,16.635 9.526,22.967 6.335,6.331 14.647,9.504 22.967,9.526 L 47.15,78.827 C 40.5,78.806 33.856,76.268 28.793,71.207 z"
id="path3075" />
<path
style="fill:#ffffff;fill-opacity:1"
inkscape:connector-curvature="0"
d="M 18.423,81.575 C 10.501,73.654 6.535,63.251 6.514,52.85 L 0,52.846 c 0.02,12.074 4.623,24.145 13.815,33.34 9.193,9.188 21.261,13.796 33.337,13.812 V 93.483 C 36.745,93.467 26.346,89.495 18.423,81.575 z"
id="path3077" />
</g><path
style="fill:#ffffff;fill-opacity:1"
inkscape:connector-curvature="0"
d="M 76.157,43.675 73.294,43.334 C 77.075,38.692 76.803,31.847 72.475,27.523 68.154,23.196 61.309,22.924 56.664,26.705 L 56.325,23.843 32.482,0 11.531,20.949 l 23.842,23.843 2.864,0.341 c -3.779,4.643 -3.506,11.485 0.819,15.811 4.325,4.325 11.167,4.596 15.81,0.819 L 55.205,64.625 79.05,88.466 100,67.519 76.157,43.675 z M 38.384,38.586 20.749,20.949 32.482,9.218 l 17.637,17.636 0.669,5.64 -6.762,6.761 -5.642,-0.669 z M 79.05,79.249 61.412,61.613 l -0.668,-5.64 6.761,-6.761 5.642,0.668 17.633,17.639 -11.73,11.73 z"
id="path3079" /></g><g
style="fill:#ffffff;fill-opacity:1"
transform="matrix(0.24999998,0,0,0.24999998,690.32253,15.514412)"
id="g3081"><path
style="fill:#ffffff;fill-opacity:1"
inkscape:connector-curvature="0"
d="M 49.541,0 C 22.198,-0.019 0.027,22.376 0,49.978 0.027,77.621 22.198,100.01 49.541,100 76.894,100.011 99.064,77.621 99.085,49.979 99.064,22.376 76.894,-0.019 49.541,0 z m 0,88.483 C 28.503,88.483 11.445,71.252 11.462,49.971 11.441,28.742 28.503,11.514 49.541,11.52 70.589,11.514 87.65,28.742 87.673,49.978 87.65,71.251 70.589,88.483 49.541,88.483 z"
id="path3083" /><path
style="fill:#ffffff;fill-opacity:1"
inkscape:connector-curvature="0"
d="m 45.37,64.349 9.073,-0.041 v -7.015 c -0.023,-1.901 0.863,-3.704 3.242,-5.261 2.38,-1.563 9.016,-4.725 9.025,-13.061 C 66.7,30.67 59.73,24.955 53.868,23.72 48.014,22.529 41.665,23.324 37.169,28.281 c -4.042,4.396 -4.892,7.892 -4.905,15.603 h 9.07 v -1.799 c -0.014,-4.103 0.458,-8.438 6.312,-9.64 3.222,-0.631 6.226,0.375 8.018,2.103 2.024,2.007 2.042,6.496 -1.222,8.722 l -5.09,3.465 c -2.959,1.919 -3.977,4.038 -3.983,7.142 v 10.472 l 10e-4,0 z"
id="path3085" /><polygon
style="fill:#ffffff;fill-opacity:1"
points="45.325,77.194 45.325,67.903 54.484,67.903 54.484,77.194 "
id="polygon3087" /></g></svg>

After

Width:  |  Height:  |  Size: 21 KiB

BIN
gui-src/css/maps/images/icons-404040.png vendored Normal file
View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 849 B

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
gui-src/css/maps/images/icons-ffffff.png vendored Normal file
View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 847 B

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

35
gui-src/css/maps/images/icons.svg vendored Normal file
View File

@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns="http://www.w3.org/2000/svg" width="26" height="260" viewBox="0 0 26 260" >
<g id="sprite" fill="#000000">
<path
id="zoomIn"
d="m 12.5,8.99999 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,2.50002 -2.5,0 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,1 c 0,0.277 0.223,0.5 0.5,0.5 l 2.5,0 0,2.5 c 0,0.277 0.223,0.5 0.5,0.5 l 1,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-2.5 2.5,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-1 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -2.5,0 0,-2.50002 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z" />
<path
id="zoomOut"
d="M 9.5,38 C 9.223,38 9,38.223 9,38.5 l 0,1 C 9,39.777 9.223,40 9.5,40 l 7,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-1 C 17,38.223 16.777,38 16.5,38 Z" />
<path
id="close"
d="m 10,61 -1,1 3,3 -3,3 1,1 3,-3 3,3 1,-1 -3,-3 3,-3 -1,-1 -3,3 z" />
<path
id="info"
d="m 13,83.99999 c -3.866,0 -7,3.134 -7,7.00002 0,3.866 3.134,7 7,7 3.8659,0 7,-3.134 7,-7 0,-3.86602 -3.1341,-7.00002 -7,-7.00002 z m -0.5,3 1,0 c 0.277,0 0.5,0.223 0.5,0.5 l 0,1 c 0,0.27702 -0.223,0.50002 -0.5,0.50002 l -1,0 c -0.277,0 -0.5,-0.223 -0.5,-0.50002 l 0,-1 c 0,-0.277 0.223,-0.5 0.5,-0.5 z m 0,3.00002 1,0 c 0.277,0 0.5,0.223 0.5,0.5 l 0,4 c 0,0.277 -0.223,0.5 -0.5,0.5 l -1,0 c -0.277,0 -0.5,-0.223 -0.5,-0.5 l 0,-4 c 0,-0.277 0.223,-0.5 0.5,-0.5 z" />
<path
id="layers"
d="m 13,110.96875 c -0.1012,-5e-4 -0.19265,0.0145 -0.28125,0.0625 L 6,113 l 0,1 6.71875,1.9375 C 12.80675,115.9855 12.8995,116 13,116 c 0.1001,0 0.19325,-0.0145 0.28125,-0.0625 L 20,114 l 0,-1 -6.71875,-1.96875 c -0.088,-0.048 -0.18155,-0.0625 -0.28125,-0.0625 z M 6,118 l 6.71875,1.9375 C 12.80675,119.9855 12.8995,120 13,120 c 0.1001,0 0.19325,-0.0145 0.28125,-0.0625 L 20,118 l 0,-2 -6.71875,1.9375 C 13.19325,117.9855 13.1001,118 13,118 c -0.1005,0 -0.19325,-0.0145 -0.28125,-0.0625 L 6,116 Z m 0,4 6.71875,1.9375 C 12.80675,123.9855 12.8995,124 13,124 c 0.1001,0 0.19325,-0.0145 0.28125,-0.0625 L 20,122 l 0,-2 -6.71875,1.9375 C 13.19325,121.9855 13.1001,122 13,122 c -0.1005,0 -0.19325,-0.0145 -0.28125,-0.0625 L 6,120 Z" />
<path
id="share"
d="m 14.3438,136.99999 2.125,2.125 -4.25,4.25002 1.4062,1.4062 4.25,-4.25002 2.125,2.12502 0,-5.65622 z m -6.3438,1 -1,1 0,9.00002 1,1 10,0 1,-1 0,-4 -1,-1 -1,1 0,3 -8,0 0,-7.00002 4,0 1,-1 -1,-1 z" />
<path
id="search"
d="m 11.5,162.99999 c -2.4853,0 -4.5,2.0147 -4.5,4.50002 0,2.4853 2.0147,4.5 4.5,4.5 0.854,0 1.6635,-0.2431 2.3437,-0.6563 l 3.6563,3.6563 1.5,-1.5 -3.6563,-3.6563 c 0.4132,-0.6802 0.6563,-1.4897 0.6563,-2.3437 0,-2.48532 -2.0147,-4.50002 -4.5,-4.50002 z m 0,1.5 c 1.6568,0 3,1.3431 3,3.00002 0,1.6568 -1.3432,3 -3,3 -1.6569,0 -3,-1.3432 -3,-3 0,-1.65692 1.3431,-3.00002 3,-3.00002 z" />
<path
id="facebook"
d="m 7,186.99998 -1,1 0,12 1,1 6.81812,1e-5 0,-5.00001 -1.8245,0 0,-2 1.8245,0 0,-2.09264 c 0,-1.80824 1.10439,-2.79288 2.7175,-2.79288 0.77272,0 1.09654,0.0575 1.29005,0.0832 l 0,1.80232 -0.77851,5.2e-4 C 16.1699,191.0005 16,191.41736 16,192.0291 l 0,1.97088 2.09228,0 -0.2724,2 -1.81988,0 0,5.00001 3,-1e-5 1,-1 0,-12 -1,-1 z" />
<path
id="twitter"
d="m 19.99957,216.12602 c -0.51509,0.22492 -1.06868,0.37693 -1.64967,0.44524 0.59299,-0.34993 1.04838,-0.90408 1.26288,-1.56444 -0.55499,0.32413 -1.16968,0.55945 -1.82397,0.68616 C 17.26502,215.14343 16.51853,214.8 15.69245,214.8 c -1.58627,0 -2.87235,1.26611 -2.87235,2.82775 0,0.22164 0.025,0.43756 0.075,0.64448 -2.38705,-0.11791 -4.50341,-1.24373 -5.91999,-2.95458 -0.24719,0.41763 -0.38889,0.90338 -0.38889,1.42162 0,0.98111 0.50699,1.84658 1.27768,2.35373 -0.4708,-0.015 -0.91369,-0.14191 -1.30088,-0.35363 -3e-4,0.012 -3e-4,0.024 -3e-4,0.035 0,1.37002 0.99008,2.51291 2.30396,2.77274 -0.241,0.065 -0.49469,0.099 -0.75669,0.099 -0.1851,0 -0.36499,-0.018 -0.54029,-0.051 0.36539,1.1234 1.42607,1.94097 2.68295,1.96377 -0.98298,0.75847 -2.22136,1.21061 -3.56713,1.21061 -0.2318,0 -0.46039,-0.013 -0.68509,-0.04 C 7.27151,225.53176 8.78128,226 10.40325,226 c 5.2831,0 8.17205,-4.30888 8.17205,-8.0457 0,-0.12261 0,-0.24462 -0.01,-0.36585 0.56129,-0.39874 1.04818,-0.89668 1.43327,-1.46383" />
<path
id="pinterest"
d="M 13.50024,238.9996 C 9.35822,238.9996 6,242.35751 6,246.49969 c 0,3.07113 1.84674,5.70949 4.48939,6.86948 -0.0211,-0.5237 -0.004,-1.15239 0.13052,-1.7222 0.14421,-0.60892 0.96507,-4.08682 0.96507,-4.08682 0,0 -0.23961,-0.47889 -0.23961,-1.18669 0,-1.11141 0.64421,-1.94155 1.44648,-1.94155 0.68215,0 1.01169,0.51241 1.01169,1.12601 0,0.68581 -0.43735,1.71156 -0.66231,2.66165 -0.18789,0.79559 0.39892,1.44451 1.1838,1.44451 1.42105,0 2.37808,-1.82512 2.37808,-3.98753 0,-1.64383 -1.10715,-2.87415 -3.12081,-2.87415 -2.27506,0 -3.69243,1.69664 -3.69243,3.59178 0,0.6534 0.19268,1.11426 0.49445,1.47102 0.13874,0.1639 0.15803,0.22983 0.10778,0.418 -0.0359,0.13804 -0.11858,0.47026 -0.15277,0.60191 -0.05,0.18998 -0.20384,0.25786 -0.37553,0.18774 -1.04789,-0.4278 -1.53596,-1.5754 -1.53596,-2.86536 0,-2.13055 1.79685,-4.68521 5.36034,-4.68521 2.86349,0 4.74808,2.0721 4.74808,4.29635 0,2.94222 -1.63569,5.14028 -4.04684,5.14028 -0.8097,0 -1.57134,-0.43774 -1.83228,-0.9349 0,0 -0.43543,1.72808 -0.52766,2.06171 -0.15897,0.57829 -0.47026,1.1562 -0.75486,1.60673 0.67461,0.19909 1.3871,0.30755 2.12562,0.30755 4.1417,0 7.49977,-3.35795 7.49977,-7.50031 0,-4.14218 -3.35807,-7.50009 -7.49977,-7.50009" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 5.3 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
gui-src/css/maps/images/spritesheet.png vendored Normal file
View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

297
gui-src/css/maps/images/spritesheet.svg vendored Normal file
View File

@@ -0,0 +1,297 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Layer_1"
x="0px"
y="0px"
width="1080"
height="60"
viewBox="0 0 1080 59.999999"
enable-background="new 0 0 100 100"
xml:space="preserve"
inkscape:version="0.48.2 r9819"
sodipodi:docname="spritesheet_new.svg"
inkscape:export-filename="/Users/aaronr/github/bboxfinder.com/css/maps/images/spritesheet_new.png"
inkscape:export-xdpi="45"
inkscape:export-ydpi="45"><metadata
id="metadata51"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs49"><inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 50 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="100 : 50 : 1"
inkscape:persp3d-origin="50 : 33.333333 : 1"
id="perspective5373" /></defs><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1226"
inkscape:window-height="844"
id="namedview47"
showgrid="true"
inkscape:zoom="0.83039936"
inkscape:cx="502.47411"
inkscape:cy="27.069218"
inkscape:window-x="197"
inkscape:window-y="15"
inkscape:window-maximized="0"
inkscape:current-layer="Layer_1"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
borderlayer="false"><inkscape:grid
type="xygrid"
id="grid6480"
empspacing="5"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true" /></sodipodi:namedview>
<path
inkscape:connector-curvature="0"
id="path6172"
d=""
style="fill:#bbbbbb;fill-opacity:1;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none" /><path
inkscape:connector-curvature="0"
id="path6178"
d=""
style="fill:#bbbbbb;fill-opacity:1;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none" /><path
inkscape:connector-curvature="0"
id="path6184"
d=""
style="fill:#bbbbbb;fill-opacity:1;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none" /><path
inkscape:connector-curvature="0"
id="path6186"
d=""
style="fill:#bbbbbb;fill-opacity:1;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none" /><path
inkscape:connector-curvature="0"
id="path6270"
d=""
style="fill:#bbbbbb;fill-opacity:1;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none" /><path
inkscape:connector-curvature="0"
id="path6288"
d=""
style="fill:#bbbbbb;fill-opacity:1;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none" /><path
inkscape:connector-curvature="0"
id="path6682"
d=""
style="fill:#bbbbbb;fill-opacity:1;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none" /><path
inkscape:connector-curvature="0"
id="path6684"
d=""
style="fill:#bbbbbb;fill-opacity:1;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none" /><g
style="fill:#464646;fill-opacity:1"
id="g3558"
transform="translate(-1.07,-5e-7)">
<path
style="fill:#464646;fill-opacity:1"
inkscape:connector-curvature="0"
d="m 18,36 v 6 h 6 v -6 h -6 z m 4,4 h -2 v -2 h 2 v 2 z"
id="path3560" />
<path
style="fill:#464646;fill-opacity:1"
inkscape:connector-curvature="0"
d="m 36,18 v 6 h 6 v -6 h -6 z m 4,4 h -2 v -2 h 2 v 2 z"
id="path3562" />
<polygon
style="fill:#464646;fill-opacity:1"
points="20.857,36.854 36.857,20.857 39.142,23.142 23.142,39.145 "
id="polygon3564" />
</g><polygon
style="fill:#464646;fill-opacity:1"
points="100,24.565 97.904,39.396 83.07,42 76,28.773 86.463,18 "
id="polygon3566"
transform="translate(-1.07,-5e-7)" /><rect
style="fill:#464646;fill-opacity:1"
x="138.92999"
y="20"
width="20"
height="20"
id="rect3568" /><path
style="fill:#464646;fill-opacity:1"
inkscape:connector-curvature="0"
d="m 219.93,30 c 0,6.078 -4.926,11 -11,11 -6.074,0 -11,-4.922 -11,-11 0,-6.074 4.926,-11 11,-11 6.074,0 11,4.926 11,11 z"
id="path3570" /><path
style="fill:#464646;fill-opacity:1"
inkscape:connector-curvature="0"
d="m 268.93,19 c -4.971,0 -9,4.028999 -9,9 0,4.971 5.001,12 9,14 4.001,-2 9,-9.029 9,-14 0,-4.971001 -4.029,-9 -9,-9 z m 0,12.5 c -2.484,0 -4.5,-2.014 -4.5,-4.5 0,-2.484001 2.016,-4.5 4.5,-4.5 2.485,0 4.5,2.015999 4.5,4.5 0,2.486 -2.015,4.5 -4.5,4.5 z"
id="path3572" /><g
style="fill:#464646;fill-opacity:1"
id="g3574"
transform="translate(-1.07,-5e-7)">
<path
style="fill:#464646;fill-opacity:1"
inkscape:connector-curvature="0"
d="m 337,30.156 v 0.407 5.604 c 0,1.658 -1.344,3 -3,3 h -10 c -1.655,0 -3,-1.342 -3,-3 v -10 c 0,-1.657 1.345,-3 3,-3 h 6.345 l 3.19,-3.17 H 324 c -3.313,0 -6,2.687 -6,6 v 10 c 0,3.313 2.687,6 6,6 h 10 c 3.314,0 6,-2.687 6,-6 v -8.809 l -3,2.968"
id="path3576" />
<polygon
style="fill:#464646;fill-opacity:1"
points="335.891,21.809 338.719,24.637 329.828,33.529 327,33.529 327,30.699 "
id="polygon3578" />
<rect
style="fill:#464646;fill-opacity:1"
x="338.69699"
y="17.826"
transform="matrix(-0.707,-0.7072,0.7072,-0.707,567.5655,274.7729)"
width="4"
height="4"
id="rect3580" />
</g><g
style="fill:#464646;fill-opacity:1"
id="g3582"
transform="translate(-1.07,-5e-7)">
<path
style="fill:#464646;fill-opacity:1"
inkscape:connector-curvature="0"
d="m 381,42 h 18 V 24 h -18 v 18 z m 14,-16 h 2 v 14 h -2 V 26 z m -4,0 h 2 v 14 h -2 V 26 z m -4,0 h 2 v 14 h -2 V 26 z m -4,0 h 2 v 14 h -2 V 26 z"
id="path3584" />
<path
style="fill:#464646;fill-opacity:1"
inkscape:connector-curvature="0"
d="m 395,20 v -2 -2 h -10 v 2 2 h -6 v 2 h 22 v -2 h -6 z m -2,0 h -6 v -2 h 6 v 2 z"
id="path3586" />
</g><g
style="opacity:0.4;fill:#464646;fill-opacity:1"
id="g3588"
transform="translate(-1.07,-5e-7)">
<path
style="fill:#464646;fill-opacity:1"
inkscape:connector-curvature="0"
d="m 458,30.156 v 0.407 5.604 c 0,1.658 -1.344,3 -3,3 h -10 c -1.655,0 -3,-1.342 -3,-3 v -10 c 0,-1.657 1.345,-3 3,-3 h 6.345 l 3.19,-3.17 H 445 c -3.313,0 -6,2.687 -6,6 v 10 c 0,3.313 2.687,6 6,6 h 10 c 3.314,0 6,-2.687 6,-6 v -8.809 l -3,2.968"
id="path3590" />
<polygon
style="fill:#464646;fill-opacity:1"
points="456.891,21.809 459.719,24.637 450.828,33.529 448,33.529 448,30.699 "
id="polygon3592" />
<rect
style="fill:#464646;fill-opacity:1"
x="459.69699"
y="17.826"
transform="matrix(-0.707,-0.7072,0.7072,-0.707,774.118,360.3402)"
width="4"
height="4"
id="rect3594" />
</g><g
style="opacity:0.4;fill:#464646;fill-opacity:1"
id="g3596"
transform="translate(-1.07,-5e-7)">
<path
style="fill:#464646;fill-opacity:1"
inkscape:connector-curvature="0"
d="m 501,42 h 18 V 24 h -18 v 18 z m 14,-16 h 2 v 14 h -2 V 26 z m -4,0 h 2 v 14 h -2 V 26 z m -4,0 h 2 v 14 h -2 V 26 z m -4,0 h 2 v 14 h -2 V 26 z"
id="path3598" />
<path
style="fill:#464646;fill-opacity:1"
inkscape:connector-curvature="0"
d="m 515,20 v -2 -2 h -10 v 2 2 h -6 v 2 h 22 v -2 h -6 z m -2,0 h -6 v -2 h 6 v 2 z"
id="path3600" />
</g><rect
style="opacity:0.4;fill:#464646;fill-opacity:1;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none"
id="rect3684"
width="540"
height="60"
x="542"
y="1.9999995" /><path
style="opacity:0.8;fill:#464646;fill-opacity:1;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none"
d="m 542.50845,29.920029 0,-29.0322577 268.74579,0 268.74576,0 0,29.0322577 0,29.032258 -268.74576,0 -268.74579,0 0,-29.032258 z"
id="path3686"
inkscape:connector-curvature="0" /><g
transform="translate(540,-1.0000005)"
id="g3654"
style="fill:#ffffff;fill-opacity:1">
<path
id="path3656"
d="m 18,36 v 6 h 6 v -6 h -6 z m 4,4 h -2 v -2 h 2 v 2 z"
inkscape:connector-curvature="0"
style="fill:#ffffff;fill-opacity:1" />
<path
id="path3658"
d="m 36,18 v 6 h 6 v -6 h -6 z m 4,4 h -2 v -2 h 2 v 2 z"
inkscape:connector-curvature="0"
style="fill:#ffffff;fill-opacity:1" />
<polygon
id="polygon3660"
points="36.857,20.857 39.142,23.142 23.142,39.145 20.857,36.854 "
style="fill:#ffffff;fill-opacity:1" />
</g><polygon
transform="translate(540,-1.0000005)"
id="polygon3662"
points="100,24.565 97.904,39.396 83.07,42 76,28.773 86.463,18 "
style="fill:#ffffff;fill-opacity:1" /><rect
id="rect3664"
height="20"
width="20"
y="19"
x="680"
style="fill:#ffffff;fill-opacity:1" /><path
id="path3666"
d="m 761,29 c 0,6.078001 -4.926,11 -11,11 -6.074,0 -11,-4.921999 -11,-11 0,-6.073999 4.926,-10.999999 11,-10.999999 6.074,0 11,4.926 11,10.999999 z"
inkscape:connector-curvature="0"
style="fill:#ffffff;fill-opacity:1" /><path
id="path3668"
d="m 810,18.000001 c -4.971,0 -9,4.028999 -9,8.999999 0,4.971001 5.001,12 9,14 4.001,-2 9,-9.028999 9,-14 0,-4.971 -4.029,-8.999999 -9,-8.999999 z M 810,30.5 c -2.484,0 -4.5,-2.013999 -4.5,-4.5 0,-2.483999 2.016,-4.5 4.5,-4.5 2.485,0 4.5,2.016001 4.5,4.5 0,2.486001 -2.015,4.5 -4.5,4.5 z"
inkscape:connector-curvature="0"
style="fill:#ffffff;fill-opacity:1" /><g
transform="translate(540,-1.0000005)"
id="g3670"
style="fill:#ffffff;fill-opacity:1">
<path
id="path3672"
d="m 337,30.156 v 0.407 5.604 c 0,1.658 -1.344,3 -3,3 h -10 c -1.655,0 -3,-1.342 -3,-3 v -10 c 0,-1.657 1.345,-3 3,-3 h 6.345 l 3.19,-3.17 H 324 c -3.313,0 -6,2.687 -6,6 v 10 c 0,3.313 2.687,6 6,6 h 10 c 3.314,0 6,-2.687 6,-6 v -8.809 l -3,2.968"
inkscape:connector-curvature="0"
style="fill:#ffffff;fill-opacity:1" />
<polygon
id="polygon3674"
points="335.891,21.809 338.719,24.637 329.828,33.529 327,33.529 327,30.699 "
style="fill:#ffffff;fill-opacity:1" />
<rect
id="rect3676"
height="4"
width="4"
transform="matrix(-0.707,-0.7072,0.7072,-0.707,567.5655,274.7729)"
y="17.826"
x="338.69699"
style="fill:#ffffff;fill-opacity:1" />
</g><g
transform="translate(540,-1.0000005)"
id="g3678"
style="fill:#ffffff;fill-opacity:1">
<path
id="path3680"
d="m 381,42 h 18 V 24 h -18 v 18 z m 14,-16 h 2 v 14 h -2 V 26 z m -4,0 h 2 v 14 h -2 V 26 z m -4,0 h 2 v 14 h -2 V 26 z m -4,0 h 2 v 14 h -2 V 26 z"
inkscape:connector-curvature="0"
style="fill:#ffffff;fill-opacity:1" />
<path
id="path3682"
d="m 395,20 v -2 -2 h -10 v 2 2 h -6 v 2 h 22 v -2 h -6 z m -2,0 h -6 v -2 h 6 v 2 z"
inkscape:connector-curvature="0"
style="fill:#ffffff;fill-opacity:1" />
</g></svg>

After

Width:  |  Height:  |  Size: 11 KiB

478
gui-src/css/maps/leaflet.css vendored Normal file
View File

@@ -0,0 +1,478 @@
/* required styles */
.leaflet-map-pane,
.leaflet-tile,
.leaflet-marker-icon,
.leaflet-marker-shadow,
.leaflet-tile-pane,
.leaflet-tile-container,
.leaflet-overlay-pane,
.leaflet-shadow-pane,
.leaflet-marker-pane,
.leaflet-popup-pane,
.leaflet-overlay-pane svg,
.leaflet-zoom-box,
.leaflet-image-layer,
.leaflet-layer {
position: absolute;
left: 0;
top: 0;
}
.leaflet-container {
overflow: hidden;
-ms-touch-action: none;
}
.leaflet-tile,
.leaflet-marker-icon,
.leaflet-marker-shadow {
-webkit-user-select: none;
-moz-user-select: none;
user-select: none;
-webkit-user-drag: none;
}
.leaflet-marker-icon,
.leaflet-marker-shadow {
display: block;
}
/* map is broken in FF if you have max-width: 100% on tiles */
.leaflet-container img {
max-width: none !important;
}
/* stupid Android 2 doesn't understand "max-width: none" properly */
.leaflet-container img.leaflet-image-layer {
max-width: 15000px !important;
}
.leaflet-tile {
filter: inherit;
visibility: hidden;
}
.leaflet-tile-loaded {
visibility: inherit;
}
.leaflet-zoom-box {
width: 0;
height: 0;
}
/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */
.leaflet-overlay-pane svg {
-moz-user-select: none;
}
.leaflet-tile-pane { z-index: 2; }
.leaflet-objects-pane { z-index: 3; }
.leaflet-overlay-pane { z-index: 4; }
.leaflet-shadow-pane { z-index: 5; }
.leaflet-marker-pane { z-index: 6; }
.leaflet-popup-pane { z-index: 7; }
.leaflet-vml-shape {
width: 1px;
height: 1px;
}
.lvml {
behavior: url(#default#VML);
display: inline-block;
position: absolute;
}
/* control positioning */
.leaflet-control {
position: relative;
z-index: 7;
pointer-events: auto;
}
.leaflet-top,
.leaflet-bottom {
position: absolute;
z-index: 1000;
pointer-events: none;
}
.leaflet-top {
top: 0;
}
.leaflet-right {
right: 0;
}
.leaflet-bottom {
bottom: 0;
}
.leaflet-left {
left: 0;
}
.leaflet-control {
float: left;
clear: both;
}
.leaflet-right .leaflet-control {
float: right;
}
.leaflet-top .leaflet-control {
margin-top: 10px;
}
.leaflet-bottom .leaflet-control {
margin-bottom: 10px;
}
.leaflet-left .leaflet-control {
margin-left: 10px;
}
.leaflet-right .leaflet-control {
margin-right: 10px;
}
/* zoom and fade animations */
.leaflet-fade-anim .leaflet-tile,
.leaflet-fade-anim .leaflet-popup {
opacity: 0;
-webkit-transition: opacity 0.2s linear;
-moz-transition: opacity 0.2s linear;
-o-transition: opacity 0.2s linear;
transition: opacity 0.2s linear;
}
.leaflet-fade-anim .leaflet-tile-loaded,
.leaflet-fade-anim .leaflet-map-pane .leaflet-popup {
opacity: 1;
}
.leaflet-zoom-anim .leaflet-zoom-animated {
-webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
-moz-transition: -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
-o-transition: -o-transform 0.25s cubic-bezier(0,0,0.25,1);
transition: transform 0.25s cubic-bezier(0,0,0.25,1);
}
.leaflet-zoom-anim .leaflet-tile,
.leaflet-pan-anim .leaflet-tile,
.leaflet-touching .leaflet-zoom-animated {
-webkit-transition: none;
-moz-transition: none;
-o-transition: none;
transition: none;
}
.leaflet-zoom-anim .leaflet-zoom-hide {
visibility: hidden;
}
/* cursors */
.leaflet-clickable {
cursor: pointer;
}
.leaflet-container {
cursor: -webkit-grab;
cursor: -moz-grab;
}
.leaflet-popup-pane,
.leaflet-control {
cursor: auto;
}
.leaflet-dragging .leaflet-container,
.leaflet-dragging .leaflet-clickable {
cursor: move;
cursor: -webkit-grabbing;
cursor: -moz-grabbing;
}
/* visual tweaks */
.leaflet-container {
background: #ddd;
outline: 0;
}
.leaflet-container a {
color: #0078A8;
}
.leaflet-container a.leaflet-active {
outline: 2px solid orange;
}
.leaflet-zoom-box {
border: 2px dotted #38f;
background: rgba(255,255,255,0.5);
}
/* general typography */
.leaflet-container {
font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
}
/* general toolbar styles */
.leaflet-bar {
box-shadow: 0 1px 5px rgba(0,0,0,0.65);
border-radius: 4px;
}
.leaflet-bar a,
.leaflet-bar a:hover {
background-color: #fff;
border-bottom: 1px solid #ccc;
width: 26px;
height: 26px;
line-height: 26px;
display: block;
text-align: center;
text-decoration: none;
color: black;
}
.leaflet-bar a,
.leaflet-control-layers-toggle {
background-position: 50% 50%;
background-repeat: no-repeat;
display: block;
}
.leaflet-bar a:hover {
background-color: #f4f4f4;
}
.leaflet-bar a:first-child {
border-top-left-radius: 4px;
border-top-right-radius: 4px;
}
.leaflet-bar a:last-child {
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
border-bottom: none;
}
.leaflet-bar a.leaflet-disabled {
cursor: default;
background-color: #f4f4f4;
color: #bbb;
}
.leaflet-touch .leaflet-bar a {
width: 30px;
height: 30px;
line-height: 30px;
}
/* zoom control */
.leaflet-control-zoom-in,
.leaflet-control-zoom-out {
font: bold 18px 'Lucida Console', Monaco, monospace;
text-indent: 1px;
}
.leaflet-control-zoom-out {
font-size: 20px;
}
.leaflet-touch .leaflet-control-zoom-in {
font-size: 22px;
}
.leaflet-touch .leaflet-control-zoom-out {
font-size: 24px;
}
/* layers control */
.leaflet-control-layers {
box-shadow: 0 1px 5px rgba(0,0,0,0.4);
background: #fff;
border-radius: 5px;
}
.leaflet-control-layers-toggle {
background-image: url(images/layers.png);
width: 36px;
height: 36px;
}
.leaflet-retina .leaflet-control-layers-toggle {
background-image: url(images/layers-2x.png);
background-size: 26px 26px;
}
.leaflet-touch .leaflet-control-layers-toggle {
width: 44px;
height: 44px;
}
.leaflet-control-layers .leaflet-control-layers-list,
.leaflet-control-layers-expanded .leaflet-control-layers-toggle {
display: none;
}
.leaflet-control-layers-expanded .leaflet-control-layers-list {
display: block;
position: relative;
}
.leaflet-control-layers-expanded {
padding: 6px 10px 6px 6px;
color: #333;
background: #fff;
}
.leaflet-control-layers-selector {
margin-top: 2px;
position: relative;
top: 1px;
}
.leaflet-control-layers label {
display: block;
}
.leaflet-control-layers-separator {
height: 0;
border-top: 1px solid #ddd;
margin: 5px -10px 5px -6px;
}
/* attribution and scale controls */
.leaflet-container .leaflet-control-attribution {
background: #fff;
background: rgba(255, 255, 255, 0.7);
margin: 0;
}
.leaflet-control-attribution,
.leaflet-control-scale-line {
padding: 0 5px;
color: #333;
}
.leaflet-control-attribution a {
text-decoration: none;
}
.leaflet-control-attribution a:hover {
text-decoration: underline;
}
.leaflet-container .leaflet-control-attribution,
.leaflet-container .leaflet-control-scale {
font-size: 11px;
}
.leaflet-left .leaflet-control-scale {
margin-left: 5px;
}
.leaflet-bottom .leaflet-control-scale {
margin-bottom: 5px;
}
.leaflet-control-scale-line {
border: 2px solid #777;
border-top: none;
line-height: 1.1;
padding: 2px 5px 1px;
font-size: 11px;
white-space: nowrap;
overflow: hidden;
-moz-box-sizing: content-box;
box-sizing: content-box;
background: #fff;
background: rgba(255, 255, 255, 0.5);
}
.leaflet-control-scale-line:not(:first-child) {
border-top: 2px solid #777;
border-bottom: none;
margin-top: -2px;
}
.leaflet-control-scale-line:not(:first-child):not(:last-child) {
border-bottom: 2px solid #777;
}
.leaflet-touch .leaflet-control-attribution,
.leaflet-touch .leaflet-control-layers,
.leaflet-touch .leaflet-bar {
box-shadow: none;
}
.leaflet-touch .leaflet-control-layers,
.leaflet-touch .leaflet-bar {
border: 2px solid rgba(0,0,0,0.2);
background-clip: padding-box;
}
/* popup */
.leaflet-popup {
position: absolute;
text-align: center;
}
.leaflet-popup-content-wrapper {
padding: 1px;
text-align: left;
border-radius: 12px;
}
.leaflet-popup-content {
margin: 13px 19px;
line-height: 1.4;
}
.leaflet-popup-content p {
margin: 18px 0;
}
.leaflet-popup-tip-container {
margin: 0 auto;
width: 40px;
height: 20px;
position: relative;
overflow: hidden;
}
.leaflet-popup-tip {
width: 17px;
height: 17px;
padding: 1px;
margin: -10px auto 0;
-webkit-transform: rotate(45deg);
-moz-transform: rotate(45deg);
-ms-transform: rotate(45deg);
-o-transform: rotate(45deg);
transform: rotate(45deg);
}
.leaflet-popup-content-wrapper,
.leaflet-popup-tip {
background: white;
box-shadow: 0 3px 14px rgba(0,0,0,0.4);
}
.leaflet-container a.leaflet-popup-close-button {
position: absolute;
top: 0;
right: 0;
padding: 4px 4px 0 0;
text-align: center;
width: 18px;
height: 14px;
font: 16px/14px Tahoma, Verdana, sans-serif;
color: #c3c3c3;
text-decoration: none;
font-weight: bold;
background: transparent;
}
.leaflet-container a.leaflet-popup-close-button:hover {
color: #999;
}
.leaflet-popup-scrolled {
overflow: auto;
border-bottom: 1px solid #ddd;
border-top: 1px solid #ddd;
}
.leaflet-oldie .leaflet-popup-content-wrapper {
zoom: 1;
}
.leaflet-oldie .leaflet-popup-tip {
width: 24px;
margin: 0 auto;
-ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";
filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);
}
.leaflet-oldie .leaflet-popup-tip-container {
margin-top: -1px;
}
.leaflet-oldie .leaflet-control-zoom,
.leaflet-oldie .leaflet-control-layers,
.leaflet-oldie .leaflet-popup-content-wrapper,
.leaflet-oldie .leaflet-popup-tip {
border: 1px solid #999;
}
/* div icon */
.leaflet-div-icon {
background: #fff;
border: 1px solid #666;
}

248
gui-src/css/maps/leaflet.draw.css vendored Normal file
View File

@@ -0,0 +1,248 @@
/* ================================================================== */
/* Toolbars
/* ================================================================== */
.leaflet-draw-section {
position: relative;
}
.leaflet-draw-toolbar {
margin-top: 12px;
}
.leaflet-draw-toolbar-top {
margin-top: 0;
}
.leaflet-draw-toolbar-notop a:first-child {
border-top-right-radius: 0;
}
.leaflet-draw-toolbar-nobottom a:last-child {
border-bottom-right-radius: 0;
}
.leaflet-draw-toolbar a {
background-image: url('images/spritesheet.png');
background-repeat: no-repeat;
}
.leaflet-retina .leaflet-draw-toolbar a {
background-image: url('images/spritesheet-2x.png');
background-size: 210px 30px;
}
.leaflet-draw a {
display: block;
text-align: center;
text-decoration: none;
}
/* ================================================================== */
/* Toolbar actions menu
/* ================================================================== */
.leaflet-draw-actions {
display: none;
list-style: none;
margin: 0;
padding: 0;
position: absolute;
left: 26px; /* leaflet-draw-toolbar.left + leaflet-draw-toolbar.width */
top: 0;
}
.leaflet-right .leaflet-draw-actions {
right:26px;
left:auto;
}
.leaflet-draw-actions li {
display: inline-block;
}
/* APR */
.leaflet-draw-actions li a {
color: #ffffff;
}
.leaflet-draw-actions li:first-child a {
border-left: none;
}
.leaflet-draw-actions li:last-child a {
-webkit-border-radius: 0 4px 4px 0;
border-radius: 0 4px 4px 0;
}
.leaflet-right .leaflet-draw-actions li:last-child a {
-webkit-border-radius: 0;
border-radius: 0;
}
.leaflet-right .leaflet-draw-actions li:first-child a {
-webkit-border-radius: 4px 0 0 4px;
border-radius: 4px 0 0 4px;
}
.leaflet-draw-actions a {
background-color: #919187;
border-left: 1px solid #AAA;
color: #FFF;
font: 11px/19px "Helvetica Neue", Arial, Helvetica, sans-serif;
line-height: 28px;
text-decoration: none;
padding-left: 10px;
padding-right: 10px;
height: 28px;
}
.leaflet-draw-actions-bottom {
margin-top: 0;
white-space: nowrap;
}
.leaflet-draw-actions-top {
margin-top: 1px;
white-space: nowrap;
}
.leaflet-draw-actions-top a,
.leaflet-draw-actions-bottom a {
height: 27px;
line-height: 27px;
}
.leaflet-draw-actions a:hover {
background-color: #A0A098;
}
.leaflet-draw-actions-top.leaflet-draw-actions-bottom a {
height: 26px;
line-height: 26px;
}
/* ================================================================== */
/* Draw toolbar
/* ================================================================== */
.leaflet-draw-toolbar .leaflet-draw-draw-polyline {
background-position: -2px -2px;
}
.leaflet-draw-toolbar .leaflet-draw-draw-polygon {
background-position: -31px -2px;
}
.leaflet-draw-toolbar .leaflet-draw-draw-rectangle {
background-position: -62px -2px;
}
.leaflet-draw-toolbar .leaflet-draw-draw-circle {
background-position: -92px -2px;
}
.leaflet-draw-toolbar .leaflet-draw-draw-marker {
background-position: -122px -2px;
}
/* ================================================================== */
/* Edit toolbar
/* ================================================================== */
.leaflet-draw-toolbar .leaflet-draw-edit-edit {
background-position: -152px -2px;
}
.leaflet-draw-toolbar .leaflet-draw-edit-remove {
background-position: -182px -2px;
}
.leaflet-draw-toolbar .leaflet-draw-edit-edit.leaflet-disabled {
background-position: -212px -2px;
}
.leaflet-draw-toolbar .leaflet-draw-edit-remove.leaflet-disabled {
background-position: -242px -2px;
}
/* ================================================================== */
/* Drawing styles
/* ================================================================== */
.leaflet-mouse-marker {
background-color: #fff;
cursor: crosshair;
}
.leaflet-draw-tooltip {
background: rgb(54, 54, 54);
background: rgba(0, 0, 0, 0.5);
border: 1px solid transparent;
-webkit-border-radius: 4px;
border-radius: 4px;
color: #fff;
font: 12px/18px "Helvetica Neue", Arial, Helvetica, sans-serif;
margin-left: 20px;
margin-top: -21px;
padding: 4px 8px;
position: absolute;
white-space: nowrap;
z-index: 6;
}
.leaflet-draw-tooltip:before {
border-right: 6px solid black;
border-right-color: rgba(0, 0, 0, 0.5);
border-top: 6px solid transparent;
border-bottom: 6px solid transparent;
content: "";
position: absolute;
top: 7px;
left: -7px;
}
.leaflet-error-draw-tooltip {
background-color: #F2DEDE;
border: 1px solid #E6B6BD;
color: #B94A48;
}
.leaflet-error-draw-tooltip:before {
border-right-color: #E6B6BD;
}
.leaflet-draw-tooltip-single {
margin-top: -12px
}
.leaflet-draw-tooltip-subtext {
color: #f8d5e4;
}
.leaflet-draw-guide-dash {
font-size: 1%;
opacity: 0.6;
position: absolute;
width: 5px;
height: 5px;
}
/* ================================================================== */
/* Edit styles
/* ================================================================== */
.leaflet-edit-marker-selected {
background: rgba(254, 87, 161, 0.1);
border: 4px dashed rgba(254, 87, 161, 0.6);
-webkit-border-radius: 4px;
border-radius: 4px;
}
.leaflet-edit-move {
cursor: move;
}
.leaflet-edit-resize {
cursor: pointer;
}

49
gui-src/css/maps/leaflet.draw.ie.css vendored Normal file
View File

@@ -0,0 +1,49 @@
/* Conditional stylesheet for IE. */
.leaflet-draw-toolbar {
border: 3px solid #999;
}
.leaflet-draw-toolbar a {
background-color: #eee;
}
.leaflet-draw-toolbar a:hover {
background-color: #fff;
}
.leaflet-draw-actions {
left: 32px;
margin-top: 3px;
}
.leaflet-draw-actions li {
display: inline;
zoom: 1;
}
.leaflet-edit-marker-selected {
border: 4px dashed #fe93c2;
}
.leaflet-draw-actions a {
background-color: #999;
}
.leaflet-draw-actions a:hover {
background-color: #a5a5a5;
}
.leaflet-draw-actions-top a {
margin-top: 1px;
}
.leaflet-draw-actions-bottom a {
height: 28px;
line-height: 28px;
}
.leaflet-draw-actions-top.leaflet-draw-actions-bottom a {
height: 27px;
line-height: 27px;
}

51
gui-src/css/maps/leaflet.ie.css vendored Normal file
View File

@@ -0,0 +1,51 @@
.leaflet-vml-shape {
width: 1px;
height: 1px;
}
.lvml {
behavior: url(#default#VML);
display: inline-block;
position: absolute;
}
.leaflet-control {
display: inline;
}
.leaflet-popup-tip {
width: 21px;
_width: 27px;
margin: 0 auto;
_margin-top: -3px;
filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);
-ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";
}
.leaflet-popup-tip-container {
margin-top: -1px;
}
.leaflet-popup-content-wrapper, .leaflet-popup-tip {
border: 1px solid #999;
}
.leaflet-popup-content-wrapper {
zoom: 1;
}
.leaflet-control-zoom,
.leaflet-control-layers {
border: 3px solid #999;
}
.leaflet-control-layers-toggle {
}
.leaflet-control-attribution,
.leaflet-control-layers,
.leaflet-control-scale-line {
background: white;
}
.leaflet-zoom-box {
filter: alpha(opacity=50);
}
.leaflet-control-attribution {
border-top: 1px solid #bbb;
border-left: 1px solid #bbb;
}

159
gui-src/css/maps/leaflet.sidebar.css vendored Normal file
View File

@@ -0,0 +1,159 @@
.leaflet-sidebar {
position: absolute;
height: 100%;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
padding: 10px;
z-index: 20000;
}
.leaflet-sidebar.left {
left: -700px;
transition: left 0.5s, width 0.5s;
padding-right: 0;
}
.leaflet-sidebar.right {
right: -700px;
transition: right 0.5s, width 0.5s;
padding-left: 0;
}
.leaflet-sidebar.left.visible {
left: 0;
}
.leaflet-sidebar.right.visible {
right: 0;
}
.leaflet-left {
transition: left 0.5s;
}
.leaflet-right {
transition: right 0.5s;
}
.leaflet-sidebar > .leaflet-control {
height: 100%;
width: 100%;
overflow: auto;
-webkit-overflow-scrolling: touch;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
padding: 8px 24px;
font-size: 1.1em;
background: white;
box-shadow: 0 1px 7px rgba(0,0,0,0.65);
-webkit-border-radius: 4px;
border-radius: 4px;
}
@media(max-width:767px){
.leaflet-sidebar {
width: 100%;
padding: 0;
}
.leaflet-sidebar.left {
left: -100%;
}
.leaflet-sidebar.right {
right: -100%;
}
.leaflet-sidebar.left.visible {
left: 0;
}
.leaflet-sidebar.right.visible {
right: 0;
}
.leaflet-sidebar > .leaflet-control {
box-shadow: none;
-webkit-border-radius: 0;
border-radius: 0;
}
.leaflet-sidebar.left.visible ~ .leaflet-left {
left: 100%;
}
.leaflet-sidebar.right.visible ~ .leaflet-right {
right: 100%;
}
}
@media(min-width:768px) and (max-width:991px){
.leaflet-sidebar {
width: 505px;
}
.leaflet-sidebar.left.visible ~ .leaflet-left {
left: 505px;
}
.leaflet-sidebar.right.visible ~ .leaflet-right {
right: 505px;
}
}
@media(min-width:992px) and (max-width:1199px){
.leaflet-sidebar {
width: 590px;
}
.leaflet-sidebar.left.visible ~ .leaflet-left {
left: 590px;
}
.leaflet-sidebar.right.visible ~ .leaflet-right {
right: 590px;
}
}
@media(min-width:1200px){
.leaflet-sidebar {
width: 660px;
}
.leaflet-sidebar.left.visible ~ .leaflet-left {
left: 660px;
}
.leaflet-sidebar.right.visible ~ .leaflet-right {
right: 660px;
}
}
.leaflet-sidebar .close {
position: absolute;
right: 20px;
top: 20px;
width: 31px;
height: 31px;
color: #333;
font-size: 25pt;
line-height: 1em;
text-align: center;
background: white;
-webkit-border-radius: 16px;
border-radius: 16px;
cursor: pointer;
z-index: 8;
}

757
gui-src/css/maps/mapbox.standalone.css vendored Normal file
View File

@@ -0,0 +1,757 @@
/* general typography */
.leaflet-container {
background:#fff;
font:15px/25px 'Helvetica Neue', Arial, Helvetica, sans-serif;
color:#404040;
color:rgba(0,0,0,0.75);
outline:0;
overflow:hidden;
-ms-touch-action:none;
}
.leaflet-container *,
.leaflet-container *:after,
.leaflet-container *:before {
-webkit-box-sizing:border-box;
-moz-box-sizing:border-box;
box-sizing:border-box;
}
.leaflet-container h1,
.leaflet-container h2,
.leaflet-container h3,
.leaflet-container h4,
.leaflet-container h5,
.leaflet-container h6,
.leaflet-container p {
font-size:15px;
line-height:25px;
margin:0 0 10px;
}
.mapbox-small,
.leaflet-control-attribution,
.leaflet-control-scale,
.leaflet-container input,
.leaflet-container textarea,
.leaflet-container label,
.leaflet-container small {
font-size:12px;
line-height:20px;
}
.leaflet-container a {
color:#3887BE;
font-weight:normal;
text-decoration:none;
}
.leaflet-container a:hover { color:#63b6e5; }
.leaflet-container.dark a { color:#63b6e5; }
.leaflet-container.dark a:hover { color:#8fcaec; }
.leaflet-container.dark .mapbox-button,
.leaflet-container .mapbox-button {
background-color:#3887be;
display:inline-block;
height:40px;
line-height:40px;
text-decoration:none;
color:#fff;
font-size:12px;
white-space:nowrap;
text-overflow:ellipsis;
}
.leaflet-container.dark .mapbox-button:hover,
.leaflet-container .mapbox-button:hover {
color:#fff;
background-color:#3bb2d0;
}
/* Base Leaflet
------------------------------------------------------- */
.leaflet-map-pane,
.leaflet-tile,
.leaflet-marker-icon,
.leaflet-marker-shadow,
.leaflet-tile-pane,
.leaflet-tile-container,
.leaflet-overlay-pane,
.leaflet-shadow-pane,
.leaflet-marker-pane,
.leaflet-popup-pane,
.leaflet-overlay-pane svg,
.leaflet-zoom-box,
.leaflet-image-layer,
.leaflet-layer {
position:absolute;
left:0;
top:0;
}
.leaflet-tile,
.leaflet-marker-icon,
.leaflet-marker-shadow {
-webkit-user-drag:none;
-webkit-user-select:none;
-moz-user-select:none;
user-select:none;
}
.leaflet-marker-icon,
.leaflet-marker-shadow {
display: block;
}
.leaflet-tile {
filter:inherit;
visibility:hidden;
}
.leaflet-tile-loaded {
visibility:inherit;
}
.leaflet-zoom-box {
width:0;
height:0;
}
.leaflet-tile-pane { z-index:2; }
.leaflet-objects-pane { z-index:3; }
.leaflet-overlay-pane { z-index:4; }
.leaflet-shadow-pane { z-index:5; }
.leaflet-marker-pane { z-index:6; }
.leaflet-popup-pane { z-index:7; }
.leaflet-control {
position:relative;
z-index:7;
pointer-events:auto;
float:left;
clear:both;
}
.leaflet-right .leaflet-control { float:right; }
.leaflet-top .leaflet-control { margin-top:10px; }
.leaflet-bottom .leaflet-control { margin-bottom:10px; }
.leaflet-left .leaflet-control { margin-left:10px; }
.leaflet-right .leaflet-control { margin-right:10px; }
.leaflet-top,
.leaflet-bottom {
position:absolute;
z-index:1000;
pointer-events:none;
}
.leaflet-top { top:0; }
.leaflet-right { right:0; }
.leaflet-bottom { bottom:0; }
.leaflet-left { left:0; }
/* zoom and fade animations */
.leaflet-fade-anim .leaflet-tile,
.leaflet-fade-anim .leaflet-popup {
opacity:0;
-webkit-transition:opacity 0.2s linear;
-moz-transition:opacity 0.2s linear;
-o-transition:opacity 0.2s linear;
transition:opacity 0.2s linear;
}
.leaflet-fade-anim .leaflet-tile-loaded,
.leaflet-fade-anim .leaflet-map-pane .leaflet-popup {
opacity:1;
}
.leaflet-zoom-anim .leaflet-zoom-animated {
-webkit-transition:-webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
-moz-transition: -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
-o-transition: -o-transform 0.25s cubic-bezier(0,0,0.25,1);
transition: transform 0.25s cubic-bezier(0,0,0.25,1);
}
.leaflet-zoom-anim .leaflet-tile,
.leaflet-pan-anim .leaflet-tile,
.leaflet-touching .leaflet-zoom-animated {
-webkit-transition:none;
-moz-transition:none;
-o-transition:none;
transition:none;
}
.leaflet-zoom-anim .leaflet-zoom-hide { visibility: hidden; }
/* cursors */
.map-clickable,
.leaflet-clickable {
cursor: pointer;
}
.leaflet-popup-pane,
.leaflet-control {
cursor:auto;
}
.leaflet-container {
cursor:-webkit-grab;
cursor: -moz-grab;
}
.leaflet-dragging,
.leaflet-dragging .map-clickable,
.leaflet-dragging .leaflet-clickable,
.leaflet-dragging .leaflet-container {
cursor:move;
cursor:-webkit-grabbing;
cursor: -moz-grabbing;
}
.leaflet-zoom-box {
background:#fff;
border:2px dotted #202020;
opacity:0.5;
}
/* general toolbar styles */
.leaflet-control-layers,
.leaflet-bar {
background-color:#fff;
border:1px solid #999;
border-color:rgba(0,0,0,0.4);
border-radius:3px;
box-shadow:none;
}
.leaflet-bar a,
.leaflet-bar a:hover {
color:#404040;
color:rgba(0,0,0,0.75);
border-bottom:1px solid #ddd;
border-bottom-color:rgba(0,0,0,0.10);
}
.leaflet-bar a:hover,
.leaflet-bar a:active {
background-color:#f8f8f8;
cursor:pointer;
}
.leaflet-bar a:first-child {
border-radius:3px 3px 0 0;
}
.leaflet-bar a:last-child {
border-bottom:none;
border-radius:0 0 3px 3px;
}
.leaflet-bar a:only-of-type {
border-radius:3px;
}
.leaflet-bar .leaflet-disabled {
cursor:default;
opacity:0.75;
}
.leaflet-control-zoom-in,
.leaflet-control-zoom-out {
display:block;
content:'';
text-indent:-999em;
}
.leaflet-control-layers .leaflet-control-layers-list,
.leaflet-control-layers-expanded .leaflet-control-layers-toggle {
display:none;
}
.leaflet-control-layers-expanded .leaflet-control-layers-list {
display:block;
position:relative;
}
.leaflet-control-layers-expanded {
background:#fff;
padding:6px 10px 6px 6px;
color:#404040;
color:rgba(0,0,0,0.75);
}
.leaflet-control-layers-selector {
margin-top:2px;
position:relative;
top:1px;
}
.leaflet-control-layers label {
display: block;
}
.leaflet-control-layers-separator {
height:0;
border-top:1px solid #ddd;
border-top-color:rgba(0,0,0,0.10);
margin:5px -10px 5px -6px;
}
.leaflet-container .leaflet-control-attribution {
background-color:rgba(255,255,255,0.25);
margin:0;
box-shadow:none;
}
.leaflet-control-attribution a:hover,
.map-info-container a:hover {
color:inherit;
text-decoration:underline;
}
.leaflet-control-attribution,
.leaflet-control-scale-line {
padding:0 5px;
}
.leaflet-left .leaflet-control-scale { margin-left:5px; }
.leaflet-bottom .leaflet-control-scale { margin-bottom:5px; }
.leaflet-control-scale-line {
background-color:rgba(255,255,255,0.5);
border:1px solid #999;
border-color:rgba(0,0,0,0.4);
border-top:none;
padding:2px 5px 1px;
white-space:nowrap;
overflow:hidden;
}
.leaflet-control-scale-line:not(:first-child) {
border-top:2px solid #ddd;
border-top-color:rgba(0,0,0,0.10);
border-bottom:none;
margin-top:-2px;
}
.leaflet-control-scale-line:not(:first-child):not(:last-child) {
border-bottom:2px solid #777;
}
/* popup */
.leaflet-popup {
position:absolute;
text-align:center;
pointer-events:none;
}
.leaflet-popup-content-wrapper {
padding:1px;
text-align:left;
pointer-events:all;
}
.leaflet-popup-content {
padding:10px 10px 15px;
margin:0;
line-height:inherit;
}
.leaflet-popup-tip-container {
width:20px;
height:20px;
margin:0 auto;
position:relative;
}
.leaflet-popup-tip {
width:0;
height:0;
margin:0;
border-left:10px solid transparent;
border-right:10px solid transparent;
border-top:10px solid #fff;
box-shadow:none;
}
.leaflet-popup-close-button {
text-indent:-999em;
position:absolute;
top:0;right:0;
pointer-events:all;
}
.leaflet-popup-close-button:hover {
background-color:#f8f8f8;
}
.leaflet-popup-scrolled {
overflow:auto;
border-bottom:1px solid #ddd;
border-top:1px solid #ddd;
}
/* div icon */
.leaflet-div-icon {
background:#fff;
border:1px solid #999;
border-color:rgba(0,0,0,0.4);
}
.leaflet-editing-icon {
border-radius:3px;
}
/* Leaflet + Mapbox
------------------------------------------------------- */
.leaflet-bar a,
.mapbox-icon,
.map-tooltip.closable .close,
.leaflet-control-layers-toggle,
.leaflet-popup-close-button,
.mapbox-button-icon:before {
content:'';
display:inline-block;
width:26px;
height:26px;
vertical-align:middle;
background-repeat:no-repeat;
}
.leaflet-bar a {
display:block;
}
.leaflet-control-zoom-in,
.leaflet-control-zoom-out,
.leaflet-popup-close-button,
.leaflet-control-layers-toggle,
.leaflet-container.dark .map-tooltip .close,
.map-tooltip .close,
.mapbox-icon {
background-image:url(./images/icons-404040.png);
background-repeat:no-repeat;
background-size:26px 260px;
}
.mapbox-button-icon:before,
.leaflet-container.dark .leaflet-control-zoom-in,
.leaflet-container.dark .leaflet-control-zoom-out,
.leaflet-container.dark .leaflet-control-layers-toggle,
.leaflet-container.dark .mapbox-icon {
background-image:url(./images/icons-ffffff.png);
background-size:26px 260px;
}
.leaflet-bar .leaflet-control-zoom-in { background-position:0 0; }
.leaflet-bar .leaflet-control-zoom-out { background-position:0 -26px; }
.map-tooltip .close, .leaflet-popup-close-button { background-position:0 -52px; }
.mapbox-icon-info { background-position:0 -78px; }
.leaflet-control-layers-toggle { background-position:0 -104px; }
.mapbox-icon-share:before, .mapbox-icon-share { background-position:0 -130px; }
.mapbox-icon-geocoder:before, .mapbox-icon-geocoder { background-position:0 -156px; }
.mapbox-icon-facebook:before, .mapbox-icon-facebook { background-position:0 -182px; }
.mapbox-icon-twitter:before, .mapbox-icon-twitter { background-position:0 -208px; }
.mapbox-icon-pinterest:before, .mapbox-icon-pinterest { background-position:0 -234px; }
@media
(-webkit-min-device-pixel-ratio:2),
(min-resolution:192dpi) {
.leaflet-control-zoom-in,
.leaflet-control-zoom-out,
.leaflet-popup-close-button,
.leaflet-control-layers-toggle,
.mapbox-icon {
background-image:url(./images/icons-404040@2x.png);
}
.mapbox-button-icon:before,
.leaflet-container.dark .leaflet-control-zoom-in,
.leaflet-container.dark .leaflet-control-zoom-out,
.leaflet-container.dark .leaflet-control-layers-toggle,
.leaflet-container.dark .mapbox-icon {
background-image:url(./images/icons-ffffff@2x.png);
}
}
.leaflet-popup-content-wrapper,
.map-legends,
.map-tooltip {
background:#fff;
border-radius:3px;
box-shadow:0 1px 2px rgba(0,0,0,0.10);
}
.map-legends,
.map-tooltip {
max-width:300px;
}
.map-legends .map-legend {
padding:10px;
}
.map-tooltip {
z-index:999999;
padding:10px;
min-width:180px;
max-height:400px;
overflow:auto;
opacity:1;
-webkit-transition:opacity 150ms;
-moz-transition:opacity 150ms;
-o-transition:opacity 150ms;
transition:opacity 150ms;
}
.map-tooltip .close {
text-indent:-999em;
overflow:hidden;
display:none;
}
.map-tooltip.closable .close {
position:absolute;
top:0;right:0;
border-radius:3px;
}
.map-tooltip.closable .close:active {
background-color:#f8f8f8;
}
.leaflet-control-interaction {
position:absolute;
top:10px;
right:10px;
width:300px;
}
.leaflet-popup-content .marker-title {
font-weight:bold;
}
.leaflet-control .mapbox-button {
background-color:#fff;
border:1px solid #ddd;
border-color:rgba(0,0,0,0.10);
padding:5px 10px;
border-radius:3px;
}
/* Share modal
------------------------------------------------------- */
.mapbox-modal > div {
position:absolute;
top:0;
left:0;
width:100%;
height:100%;
z-index:-1;
overflow-y:auto;
}
.mapbox-modal.active > div {
z-index:99999;
transition:all .2s, z-index 0 0;
}
.mapbox-modal .mapbox-modal-mask {
background:rgba(0,0,0,0.5);
opacity:0;
}
.mapbox-modal.active .mapbox-modal-mask { opacity:1; }
.mapbox-modal .mapbox-modal-content {
-webkit-transform:translateY(-100%);
-moz-transform:translateY(-100%);
-ms-transform:translateY(-100%);
transform:translateY(-100%);
}
.mapbox-modal.active .mapbox-modal-content {
-webkit-transform:translateY(0);
-moz-transform:translateY(0);
-ms-transform:translateY(0);
transform:translateY(0);
}
.mapbox-modal-body {
position:relative;
background:#fff;
padding:20px;
z-index:1000;
width:50%;
margin:20px 0 20px 25%;
}
.mapbox-share-buttons {
margin:0 0 20px;
}
.mapbox-share-buttons a {
width:33.3333%;
border-left:1px solid #fff;
text-align:center;
border-radius:0;
}
.mapbox-share-buttons a:last-child { border-radius:0 3px 3px 0; }
.mapbox-share-buttons a:first-child { border:none; border-radius:3px 0 0 3px; }
.mapbox-modal input {
width:100%;
height:40px;
padding:10px;
border:1px solid #ddd;
border-color:rgba(0,0,0,0.10);
color:rgba(0,0,0,0.5);
}
/* Info Control
------------------------------------------------------- */
.leaflet-control.mapbox-control-info {
margin:5px 30px 10px 10px;
min-height:26px;
}
.leaflet-control.mapbox-control-info-right {
margin:5px 10px 10px 30px;
}
.mapbox-info-toggle {
background-color:#fff;
background-color:rgba(255,255,255,0.25);
border-radius:50%;
position:absolute;
bottom:0;left:0;
z-index:1;
}
.mapbox-control-info-right .mapbox-info-toggle { left:auto; right:0; }
.mapbox-control-info.active .mapbox-info-toggle { background-color:#fff; }
.mapbox-info-toggle:hover { background-color:rgba(255,255,255,0.5); }
.map-info-container {
background:#fff;
background:rgba(255,255,255,0.75);
padding:3px 5px 3px 15px;
display:none;
position:relative;
bottom:0;
left:13px;
border-radius:3px;
}
.mapbox-control-info.active .map-info-container { display:inline-block; }
.mapbox-control-info-right .map-info-container {
left:auto;
right:13px;
padding:3px 15px 3px 5px;
}
/* Geocoder
------------------------------------------------------- */
.leaflet-control-mapbox-geocoder {
position:relative;
}
.leaflet-control-mapbox-geocoder.searching {
opacity:0.75;
}
.leaflet-control-mapbox-geocoder .leaflet-control-mapbox-geocoder-wrap {
background:#fff;
position:absolute;
border:1px solid #999;
border-color:rgba(0,0,0,0.4);
border-bottom-width:0;
overflow:hidden;
left:26px;
height:27px;
width:0;
top:-1px;
border-radius:0 3px 3px 0;
opacity:0;
-webkit-transition:opacity 100ms;
-moz-transition:opacity 100ms;
-o-transition:opacity 100ms;
transition:opacity 100ms;
}
.leaflet-control-mapbox-geocoder.active .leaflet-control-mapbox-geocoder-wrap {
width:180px;
opacity:1;
}
.leaflet-bar .leaflet-control-mapbox-geocoder-toggle,
.leaflet-bar .leaflet-control-mapbox-geocoder-toggle:hover {
border-bottom:none;
}
.leaflet-control-mapbox-geocoder-toggle {
border-radius:3px;
}
.leaflet-control-mapbox-geocoder.active,
.leaflet-control-mapbox-geocoder.active .leaflet-control-mapbox-geocoder-toggle {
border-top-right-radius:0;
border-bottom-right-radius:0;
}
.leaflet-control-mapbox-geocoder .leaflet-control-mapbox-geocoder-form input {
background:transparent;
border:0;
width:180px;
padding:0 0 0 10px;
height:26px;
outline:none;
}
.leaflet-control-mapbox-geocoder-results {
width:180px;
position:absolute;
left:26px;
top:25px;
border-radius:0 0 3px 3px;
}
.leaflet-control-mapbox-geocoder.active .leaflet-control-mapbox-geocoder-results {
background:#fff;
border:1px solid #999;
border-color:rgba(0,0,0,0.4);
}
.leaflet-control-mapbox-geocoder-results a,
.leaflet-control-mapbox-geocoder-results span {
padding:0 10px;
text-overflow:ellipsis;
white-space:nowrap;
display:block;
width:100%;
font-size:12px;
line-height:26px;
text-align:left;
overflow:hidden;
}
.leaflet-control-mapbox-geocoder-results a:first-child {
border-top:1px solid #999;
border-top-color:rgba(0,0,0,0.4);
border-radius:0;
}
.leaflet-container.dark .leaflet-control .leaflet-control-mapbox-geocoder-results a:hover,
.leaflet-control-mapbox-geocoder-results a:hover {
background:#f8f8f8;
opacity:1;
}
/* Dark Theme
------------------------------------------------------- */
.leaflet-container.dark .leaflet-bar {
background-color:#404040;
border-color:#202020;
border-color:rgba(0,0,0,0.75);
}
.leaflet-container.dark .leaflet-bar a {
color:#404040;
border-color:rgba(0,0,0,0.5);
}
.leaflet-container.dark .leaflet-bar a:active,
.leaflet-container.dark .leaflet-bar a:hover {
background-color:#505050;
}
.leaflet-container.dark .mapbox-info-toggle,
.leaflet-container.dark .map-info-container,
.leaflet-container.dark .leaflet-control-attribution {
background-color:rgba(0,0,0,0.25);
color:#f8f8f8;
}
.leaflet-container.dark .leaflet-bar a.leaflet-disabled,
.leaflet-container.dark .leaflet-control .mapbox-button.disabled {
background-color:#252525;
color:#404040;
}
.leaflet-container.dark .leaflet-control-mapbox-geocoder > div {
border-color:#202020;
border-color:rgba(0,0,0,0.75);
}
.leaflet-container.dark .leaflet-control .leaflet-control-mapbox-geocoder-results a {
border-color:#ddd #202020;
border-color:rgba(0,0,0,0.10) rgba(0,0,0,0.75);
}
.leaflet-container.dark .leaflet-control .leaflet-control-mapbox-geocoder-results span {
border-color:#202020;
border-color:rgba(0,0,0,0.75);
}
/* Larger Screens
------------------------------------------------------- */
@media only screen and (max-width:800px) {
.mapbox-modal-body {
width:83.3333%;
margin-left:8.3333%;
}
}
/* Smaller Screens
------------------------------------------------------- */
@media only screen and (max-width:640px) {
.mapbox-modal-body {
width:100%;
height:100%;
margin:0;
}
}
/* Browser Fixes
------------------------------------------------------- */
/* Map is broken in FF if you have max-width: 100% on tiles */
.leaflet-container img { max-width:none!important; }
/* Stupid Android 2 doesn't understand "max-width: none" properly */
.leaflet-container img.leaflet-image-layer { max-width:15000px!important; }
/* Android chrome makes tiles disappear without this */
.leaflet-tile-container img { -webkit-backface-visibility:hidden; }
/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */
.leaflet-overlay-pane svg { -moz-user-select:none; }
/* Older IEs don't support the translateY property for display animation */
.leaflet-oldie .mapbox-modal .mapbox-modal-content { display:none; }
.leaflet-oldie .mapbox-modal.active .mapbox-modal-content { display:block; }
.map-tooltip { width:280px\8; /* < IE9 */ }

1
gui-src/css/maps/mapbox.v3.2.0.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

355
gui-src/css/styles.css vendored Normal file
View File

@@ -0,0 +1,355 @@
:root {
font-family: Inter, Avenir, Helvetica, Arial, sans-serif;
font-size: 16px;
line-height: 24px;
font-weight: 400;
color: #0f0f0f;
background-color: #f6f6f6;
font-synthesis: none;
text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
-webkit-text-size-adjust: 100%;
}
p {
color: #ececec;
}
.container {
margin: 0;
padding-top: 1vh;
display: flex;
flex-direction: column;
justify-content: center;
text-align: center;
}
.logo {
height: 6em;
padding: 1.5em;
will-change: filter;
transition: 0.75s;
}
.logo.arnis:hover {
filter: drop-shadow(0 0 2em #b3b3b3);
}
.row {
display: flex;
justify-content: center;
}
a {
font-weight: 500;
color: #646cff;
text-decoration: inherit;
}
a:hover {
color: #535bf2;
}
.flex-container {
display: flex;
gap: 20px;
justify-content: center;
align-items: stretch;
margin-top: 5px;
}
.section {
background: #575757;
padding: 20px;
border-radius: 8px;
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
}
.map-box,
.controls-box {
width: 45%;
background: #575757;
padding: 20px;
border-radius: 8px;
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
}
.controls-content {
display: flex;
flex-direction: column;
height: 100%;
}
.controls-box .progress-section {
margin-top: auto;
}
.map-container {
border: 2px solid #e0e0e0;
border-radius: 8px;
}
.section h2 {
margin-top: 0;
margin-bottom: 10px;
}
p {
color: #d6d6d6;
}
button {
border-radius: 8px;
border: 1px solid transparent;
padding: 0.6em 1.2em;
font-size: 1em;
font-weight: 500;
color: #0f0f0f;
background-color: #ffffff;
cursor: pointer;
transition: border-color 0.25s;
box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2);
margin-top: 10px;
width: auto;
}
button:hover {
border-color: #656565;
}
#selected-directory {
font-size: 1em;
margin-top: 6px;
}
.progress-section {
margin-top: auto;
}
.progress-section h2 {
margin-bottom: 8px;
text-align: center;
}
.progress-bar-container {
width: 100%;
height: 20px;
background-color: #e0e0e0;
border-radius: 10px;
overflow: hidden;
margin-top: 8px;
}
.progress-bar {
height: 100%;
width: 0%;
background-color: #4caf50;
transition: width 0.4s;
}
/* Left and right alignment for "Saving world..." text */
.progress-status {
display: flex;
justify-content: space-between;
font-size: 0.9em;
margin-top: 8px;
color: #fff;
}
.footer {
margin-top: 20px;
text-align: center;
font-size: 0.9em;
}
.footer-link {
color: #ffffff;
text-decoration: none;
}
.footer-link:hover {
color: #b3b3b3;
}
@media (prefers-color-scheme: dark) {
:root {
color: #f6f6f6;
background-color: #2f2f2f;
}
p {
color: #ececec;
}
input,
button {
color: #ffffff;
background-color: #0f0f0f98;
border-style: inherit;
}
button:active {
background-color: #0f0f0f69;
}
}
.tooltip {
position: relative;
display: block;
width: 100%;
}
.tooltip button {
width: 100%;
}
.controls-box button {
width: 100%;
}
/* Customization Settings */
.modal {
position: fixed;
z-index: 1000;
left: 0;
top: 0;
width: 100%;
height: 100%;
overflow: auto;
background-color: rgba(0, 0, 0, 0.4);
display: flex;
justify-content: center;
align-items: center;
}
.modal-content {
background-color: #797979;
padding: 20px;
border: 1px solid #797979;
border-radius: 10px;
width: 400px;
box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.2);
}
.close-button {
color: #e9e9e9;
float: right;
font-size: 28px;
font-weight: bold;
cursor: pointer;
}
.close-button:hover {
color: #ffffff;
}
#terrain-toggle {
accent-color: #fecc44;
}
.terrain-toggle-container, .scale-slider-container {
margin: 15px 0;
}
#fillground-toggle {
accent-color: #fecc44;
}
.fillground-toggle-container, .scale-slider-container {
margin: 15px 0;
}
.scale-slider-container label {
display: block;
margin-bottom: 5px;
}
#scale-value-slider {
accent-color: #fecc44;
}
#slider-value {
margin-left: 10px;
font-weight: bold;
}
.bbox-input-container {
margin-bottom: 20px;
}
.bbox-input-container label {
display: block;
margin-bottom: 5px;
}
#bbox-coords {
width: 100%;
padding: 8px;
border: 1px solid #fecc44;
border-radius: 4px;
font-size: 14px;
}
#bbox-coords:focus {
outline: none;
border-color: #fecc44;
box-shadow: 0 0 5px #fecc44;
}
.button-container {
display: flex;
align-items: center;
justify-content: flex-start;
gap: 5px;
}
.start-button {
padding: 10px 20px;
border: none;
border-radius: 5px;
font-size: 16px;
cursor: pointer;
transition: background-color 0.3s;
}
.start-button:hover {
background-color: #4caf50;
}
.settings-button {
width: 40px !important;
height: 38px;
border-radius: 5px;
display: flex;
justify-content: center;
align-items: center;
cursor: pointer;
transition: background-color 0.3s, border-color 0.3s;
}
.settings-button .gear-icon::before {
content: "⚙️";
font-size: 18px;
}
/* Logo Animation */
#arnis-logo {
width: 35%;
height: auto;
opacity: 0;
transform: scale(0);
animation: zoomInLogo 1s ease-out forwards;
}
/* Keyframe Animation */
@keyframes zoomInLogo {
0% {
transform: scale(0);
opacity: 0;
}
100% {
transform: scale(1);
opacity: 1;
}
}

BIN
gui-src/images/crosshair.png vendored Normal file
View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 487 B

BIN
gui-src/images/logo.png vendored Normal file
View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 231 KiB

BIN
gui-src/images/tile.png vendored Normal file
View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 811 B

150
gui-src/index.html vendored Normal file
View File

@@ -0,0 +1,150 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="stylesheet" href="./css/styles.css" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Arnis</title>
<script type="module" src="./js/main.js" defer></script>
<script type="module" src="./js/license.js" defer></script>
</head>
<body>
<main class="container">
<div class="row">
<a href="https://github.com/louis-e/arnis" target="_blank">
<img src="./images/logo.png" id="arnis-logo" class="logo arnis" alt="Arnis Logo" style="width: 35%; height: auto;" />
</a>
</div>
<div class="flex-container">
<!-- Left Box: Map and BBox Input -->
<section class="section map-box" style="margin-bottom: 0; padding-bottom: 0;">
<h2 data-localize="select_location">Select Location</h2>
<span id="bbox-text" style="font-size: 1.0em; display: block; margin-top: -8px; margin-bottom: 3px;" data-localize="zoom_in_and_choose">
Zoom in and choose your area using the rectangle tool
</span>
<iframe src="maps.html" width="100%" height="300" class="map-container" title="Map Picker"></iframe>
<span id="bbox-info"
style="font-size: 0.75em; color: #7bd864; display: block; margin-bottom: 4px; font-weight: bold; min-height: 2em;"></span>
</section>
<!-- Right Box: Directory Selection, Start Button, and Progress Bar -->
<section class="section controls-box">
<div class="controls-content">
<h2 data-localize="select_world">Select World</h2>
<!-- Updated Tooltip Structure -->
<div class="tooltip" style="width: 100%;">
<button type="button" onclick="openWorldPicker()" style="padding: 10px; line-height: 1.2; width: 100%;">
<span id="choose_world">Choose World</span>
<br>
<span id="selected-world" style="font-size: 0.8em; color: #fecc44; display: block; margin-top: 4px;" data-localize="no_world_selected">
No world selected
</span>
</button>
</div>
<div class="button-container">
<button type="button" id="start-button" class="start-button" onclick="startGeneration()" data-localize="start_generation">Start Generation</button>
<button type="button" class="settings-button" onclick="openSettings()">
<i class="gear-icon"></i>
</button>
</div>
<br><br>
<div class="progress-section">
<h2 data-localize="progress">Progress</h2>
<div class="progress-bar-container">
<div class="progress-bar" id="progress-bar"></div>
</div>
<div class="progress-status">
<span id="progress-message"></span>
<span id="progress-detail">0%</span>
</div>
</div>
</div>
</section>
</div>
<!-- World Picker Modal -->
<div id="world-modal" class="modal" style="display: none;">
<div class="modal-content">
<span class="close-button" onclick="closeWorldPicker()">&times;</span>
<h2 data-localize="choose_world_modal_title">Choose World</h2>
<button type="button" id="select-world-button" class="select-world-button" onclick="selectWorld(false)" data-localize="select_existing_world">Select existing world</button>
<button type="button" id="generate-world-button" class="generate-world-button" onclick="selectWorld(true)" data-localize="generate_new_world">Generate new world</button>
</div>
</div>
<!-- Settings Modal -->
<div id="settings-modal" class="modal" style="display: none;">
<div class="modal-content">
<span class="close-button" onclick="closeSettings()">&times;</span>
<h2 data-localize="customization_settings">Customization Settings</h2>
<!-- Terrain Toggle Button -->
<div class="terrain-toggle-container">
<label for="terrain-toggle" data-localize="terrain">Terrain:</label>
<input type="checkbox" id="terrain-toggle" name="terrain-toggle" checked>
</div>
<!-- Fill ground Toggle Button -->
<div class="fillground-toggle-container">
<label for="fillground-toggle" data-localize="fillground">Fill Ground:</label>
<input type="checkbox" id="fillground-toggle" name="fillground-toggle">
</div>
<!-- World Scale Slider -->
<div class="scale-slider-container">
<label for="scale-value-slider" data-localize="world_scale">World Scale:</label>
<input type="range" id="scale-value-slider" name="scale-value-slider" min="0.30" max="2.5" step="0.1" value="1">
<span id="slider-value">1.00</span>
</div>
<!-- Bounding Box Input -->
<div class="bbox-input-container">
<label for="bbox-coords" data-localize="custom_bounding_box">Custom Bounding Box:</label>
<input type="text" id="bbox-coords" name="bbox-coords" maxlength="55" style="width: 280px;" placeholder="Format: lat,lng,lat,lng">
</div>
<!-- Floodfill Timeout Input -->
<div class="timeout-input-container">
<label for="floodfill-timeout" data-localize="floodfill_timeout">Floodfill Timeout (sec):</label>
<input type="number" id="floodfill-timeout" name="floodfill-timeout" min="0" step="1" value="20" style="width: 100px;" placeholder="Seconds">
</div><br>
<!-- Ground Level Input -->
<div class="ground-level-input-container">
<label for="ground-level" data-localize="ground_level">Ground Level:</label>
<input type="number" id="ground-level" name="ground-level" min="-64" max="290" value="-62" style="width: 100px;" placeholder="Ground Level">
</div>
<!-- License and Credits Button -->
<button type="button" id="license-button" class="license-button" onclick="openLicense()" data-localize="license_and_credits">License and Credits</button>
</div>
</div>
<!-- License Modal -->
<div id="license-modal" class="modal" style="display: none;">
<div class="modal-content">
<span class="close-button" onclick="closeLicense()">&times;</span>
<h2 data-localize="license_and_credits">License and Credits</h2>
<div id="license-content" style="overflow-y: auto; max-height: 300px; font-size: 0.85em; line-height: 1.3; padding: 10px; border: 1px solid #ccc; border-radius: 4px;">
Loading...
</div>
</div>
</div>
<!-- Footer -->
<footer class="footer">
<a href="https://github.com/louis-e/arnis" target="_blank" class="footer-link" data-localize="footer_text">
© {year} Arnis v{version} by louis-e
</a>
</footer>
</main>
</body>
</html>

657
gui-src/js/bbox.js vendored Normal file
View File

@@ -0,0 +1,657 @@
var map, rsidebar, lsidebar, drawControl, drawnItems = null;
// Where we keep the big list of proj defs from the server
var proj4defs = null;
// Where we keep the proj objects we are using in this session
var projdefs = { "4326": L.CRS.EPSG4326, "3857": L.CRS.EPSG3857 };
var currentproj = "3857";
var currentmouse = L.latLng(0, 0);
/*
**
** override L.Rectangle
** to fire an event after setting
**
** the base parent object L.Path
** includes the L.Mixin.Events
**
** ensures bbox box is always
** the topmost SVG feature
**
*/
L.Rectangle.prototype.setBounds = function (latLngBounds) {
this.setLatLngs(this._boundsToLatLngs(latLngBounds));
this.fire('bounds-set');
}
var FormatSniffer = (function () { // execute immediately
'use strict';
/*
**
** constructor
**
*/
var FormatSniffer = function (options) {
options || (options = {});
if (!this || !(this instanceof FormatSniffer)) {
return new FormatSniffer(options);
}
this.regExes = {
ogrinfoExtent: /Extent\:\s\((.*)\)/,
bbox: /^\(([\s|\-|0-9]*\.[0-9]*,[\s|\-|0-9]*\.[0-9]*,[\s|\-|0-9]*\.[0-9]*,[\s|\-|0-9]*\.[0-9|\s]*)\)$/
};
this.data = options.data || "";
this.parse_type = null;
};
/*
**
** functions
**
*/
FormatSniffer.prototype.sniff = function () {
return this._sniffFormat();
};
FormatSniffer.prototype._is_ogrinfo = function () {
var match = this.regExes.ogrinfoExtent.exec(this.data.trim());
var extent = [];
if (match) {
var pairs = match[1].split(") - (");
for (var indx = 0; indx < pairs.length; indx++) {
var coords = pairs[indx].trim().split(",");
extent = (extent.concat([parseFloat(coords[0].trim()), parseFloat(coords[1].trim())]));
}
}
this.parse_type = "ogrinfo";
return extent;
};
FormatSniffer.prototype._is_normal_bbox = function () {
var match = this.regExes.bbox.exec(this.data.trim());
var extent = [];
if (match) {
var bbox = match[1].split(",");
for (var indx = 0; indx < bbox.length; indx++) {
var coord = bbox[indx].trim();
extent = (extent.concat([parseFloat(coord)]));
}
}
this.parse_type = "bbox";
return extent;
};
FormatSniffer.prototype._is_geojson = function () {
try {
// try JSON
var json = JSON.parse(this.data);
// try GeoJSON
var parsed_data = new L.geoJson(json)
} catch (err) {
return null;
}
this.parse_type = "geojson";
return parsed_data;
};
FormatSniffer.prototype._is_wkt = function () {
if (this.data === "") {
throw new Error("empty -- nothing to parse");
}
try {
var parsed_data = new Wkt.Wkt(this.data);
} catch (err) {
return null;
}
this.parse_type = "wkt";
return parsed_data;
};
FormatSniffer.prototype._sniffFormat = function () {
var parsed_data = null;
var fail = false;
try {
var next = true;
// try ogrinfo
parsed_data = this._is_ogrinfo()
if (parsed_data.length > 0) {
next = false;
}
// try normal bbox
if (next) {
parsed_data = this._is_normal_bbox();
if (parsed_data.length > 0) next = false;
}
// try GeoJSON
if (next) {
parsed_data = this._is_geojson();
if (parsed_data) next = false;
}
// try WKT
if (next) {
parsed_data = this._is_wkt();
if (parsed_data) next = false;
}
// no matches, throw error
if (next) {
fail = true;
/*
** sorry, this block needs to be left aligned
** to make the alert more readable
** which means, we probably shouldn't use alerts ;-)
*/
throw {
"name": "NoTypeMatchError",
"message": "The data is not a recognized format:\n \
1. ogrinfo extent output\n \
2. bbox as (xMin,yMin,xMax,yMax )\n \
3. GeoJSON\n \
4. WKT\n\n "
}
}
} catch (err) {
alert("Your paste is not parsable:\n" + err.message);
fail = true;
}
// delegate to format handler
if (!fail) {
this._formatHandler[this.parse_type].call(this._formatHandler, parsed_data);
}
return (fail ? false : true);
};
/*
** an object with functions as property names.
** if we need to add another format
** we can do so here as a property name
** to enforce reusability
**
** to add different formats as L.FeatureGroup layer
** so they work with L.Draw edit and delete options
** we fake passing event information
** and triggering draw:created for L.Draw
*/
FormatSniffer.prototype._formatHandler = {
// coerce event objects to work with L.Draw types
coerce: function (lyr, type_obj) {
var event_obj = {
layer: lyr,
layerType: null,
}
// coerce to L.Draw types
if (/point/i.test(type_obj)) {
event_obj.layerType = "marker";
}
else if (/linestring/i.test(type_obj)) {
event_obj.layerType = "polyline";
}
else if (/polygon/i.test(type_obj)) {
event_obj.layerType = "polygon";
}
return event_obj;
},
reduce_layers: function (lyr) {
var lyr_parts = [];
if (typeof lyr['getLayers'] === 'undefined') {
return [lyr];
}
else {
var all_layers = lyr.getLayers();
for (var i = 0; i < all_layers.length; i++) {
lyr_parts = lyr_parts.concat(this.reduce_layers(all_layers[i]));
}
}
return lyr_parts;
},
get_leaflet_bounds: function (data) {
/*
** data comes in an extent ( xMin,yMin,xMax,yMax )
** we need to swap lat/lng positions
** because leaflet likes it hard
*/
var sw = [data[1], data[0]];
var ne = [data[3], data[2]];
return new L.LatLngBounds(sw, ne);
},
wkt: function (data) {
var wkt_layer = data.construct[data.type].call(data);
var all_layers = this.reduce_layers(wkt_layer);
for (var indx = 0; indx < all_layers.length; indx++) {
var lyr = all_layers[indx];
var evt = this.coerce(lyr, data.type);
// call L.Draw.Feature.prototype._fireCreatedEvent
map.fire('draw:created', evt);
}
},
geojson: function (geojson_layer) {
var all_layers = this.reduce_layers(geojson_layer);
for (var indx = 0; indx < all_layers.length; indx++) {
var lyr = all_layers[indx];
var geom_type = geojson_layer.getLayers()[0].feature.geometry.type;
var evt = this.coerce(lyr, geom_type);
// call L.Draw.Feature.prototype._fireCreatedEvent
map.fire('draw:created', evt);
}
},
ogrinfo: function (data) {
var lBounds = this.get_leaflet_bounds(data);
// create a rectangle layer
var lyr = new L.Rectangle(lBounds);
var evt = this.coerce(lyr, 'polygon');
// call L.Draw.Feature.prototype._fireCreatedEvent
map.fire('draw:created', evt);
},
bbox: function (data) {
var lBounds = this.get_leaflet_bounds(data);
// create a rectangle layer
var lyr = new L.Rectangle(lBounds);
var evt = this.coerce(lyr, 'polygon');
// call L.Draw.Feature.prototype._fireCreatedEvent
map.fire('draw:created', evt);
}
};
return FormatSniffer; // return class def
})(); // end FormatSniffer
function addLayer(layer, name, title, zIndex, on) {
if (on) {
layer.setZIndex(zIndex).addTo(map);
} else {
layer.setZIndex(zIndex);
}
// Create a simple layer switcher that toggles layers on and off.
var ui = document.getElementById('map-ui');
var item = document.createElement('li');
var link = document.createElement('a');
link.href = '#';
if (on) {
link.className = 'enabled';
} else {
link.className = '';
}
link.innerHTML = name;
link.title = title;
link.onclick = function(e) {
e.preventDefault();
e.stopPropagation();
if (map.hasLayer(layer)) {
map.removeLayer(layer);
this.className = '';
} else {
map.addLayer(layer);
this.className = 'enabled';
}
};
item.appendChild(link);
ui.appendChild(item);
};
function formatBounds(bounds, proj) {
var gdal = $("input[name='gdal-checkbox']").prop('checked');
var lngLat = $("input[name='coord-order']").prop('checked');
var formattedBounds = '';
var southwest = bounds.getSouthWest();
var northeast = bounds.getNorthEast();
var xmin = 0;
var ymin = 0;
var xmax = 0;
var ymax = 0;
if (proj == '4326') {
xmin = southwest.lng.toFixed(6);
ymin = southwest.lat.toFixed(6);
xmax = northeast.lng.toFixed(6);
ymax = northeast.lat.toFixed(6);
} else {
var proj_to_use = null;
if (typeof (projdefs[proj]) !== 'undefined') {
// we have it already, then grab it and use it...
proj_to_use = projdefs[proj];
} else {
// We have not used this one yet... make it and store it...
projdefs[proj] = new L.Proj.CRS(proj, proj4defs[proj][1]);
proj_to_use = projdefs[proj];
}
southwest = proj_to_use.project(southwest)
northeast = proj_to_use.project(northeast)
xmin = southwest.x.toFixed(4);
ymin = southwest.y.toFixed(4);
xmax = northeast.x.toFixed(4);
ymax = northeast.y.toFixed(4);
}
if (gdal) {
if (lngLat) {
formattedBounds = xmin + ',' + ymin + ',' + xmax + ',' + ymax;
} else {
formattedBounds = ymin + ',' + xmin + ',' + ymax + ',' + xmax;
}
} else {
if (lngLat) {
formattedBounds = xmin + ' ' + ymin + ' ' + xmax + ' ' + ymax;
} else {
formattedBounds = ymin + ' ' + xmin + ' ' + ymax + ' ' + xmax;
}
}
return formattedBounds
}
function formatTile(point, zoom) {
var xTile = Math.floor((point.lng + 180) / 360 * Math.pow(2, zoom));
var yTile = Math.floor((1 - Math.log(Math.tan(point.lat * Math.PI / 180) + 1 / Math.cos(point.lat * Math.PI / 180)) / Math.PI) / 2 * Math.pow(2, zoom));
return xTile.toString() + ',' + yTile.toString();
}
function formatPoint(point, proj) {
var gdal = $("input[name='gdal-checkbox']").prop('checked');
var lngLat = $("input[name='coord-order']").prop('checked');
var formattedPoint = '';
if (proj == '4326') {
x = point.lng.toFixed(6);
y = point.lat.toFixed(6);
} else {
var proj_to_use = null;
if (typeof (projdefs[proj]) !== 'undefined') {
// we have it already, then grab it and use it...
proj_to_use = projdefs[proj];
} else {
// We have not used this one yet... make it and store it...
projdefs[proj] = new L.Proj.CRS(proj, proj4defs[proj][1]);
proj_to_use = projdefs[proj];
}
point = proj_to_use.project(point)
x = point.x.toFixed(4);
y = point.y.toFixed(4);
}
if (gdal) {
if (lngLat) {
formattedBounds = x + ',' + y;
} else {
formattedBounds = y + ',' + x;
}
} else {
if (lngLat) {
formattedBounds = x + ' ' + y;
} else {
formattedBounds = y + ' ' + x;
}
}
return formattedBounds
}
function validateStringAsBounds(bounds) {
var splitBounds = bounds ? bounds.split(',') : null;
return ((splitBounds !== null) &&
(splitBounds.length == 4) &&
((-90.0 <= parseFloat(splitBounds[0]) <= 90.0) &&
(-180.0 <= parseFloat(splitBounds[1]) <= 180.0) &&
(-90.0 <= parseFloat(splitBounds[2]) <= 90.0) &&
(-180.0 <= parseFloat(splitBounds[3]) <= 180.0)) &&
(parseFloat(splitBounds[0]) < parseFloat(splitBounds[2]) &&
parseFloat(splitBounds[1]) < parseFloat(splitBounds[3])))
}
$(document).ready(function () {
/*
**
** make sure all textarea inputs
** are selected once they are clicked
** because some people might not
** have flash enabled or installed
** and yes...
** there's a fucking Flash movie floating
** on top of your DOM
**
*/
$('input[type="textarea"]').on('click', function (evt) { this.select() });
// Have to init the projection input box as it is used to format the initial values
$("#projection").val(currentproj);
L.mapbox.accessToken = 'pk.eyJ1IjoiY3Vnb3MiLCJhIjoiY2p4Nm43MzA3MDFmZDQwcGxsMjB4Z3hnNiJ9.SQbnMASwdqZe6G4n6OMvVw';
map = L.mapbox.map('map').setView([50.114768, 8.687322], 4).addLayer(L.mapbox.styleLayer('mapbox://styles/mapbox/streets-v11'));
rsidebar = L.control.sidebar('rsidebar', {
position: 'right',
closeButton: true
});
rsidebar.on("sidebar-show", function (e) {
$("#map .leaflet-tile-loaded").addClass("blurred");
});
rsidebar.on("sidebar-hide", function (e) {
$('#map .leaflet-tile-loaded').removeClass('blurred');
$('#map .leaflet-tile-loaded').addClass('unblurred');
setTimeout(function () {
$('#map .leaflet-tile-loaded').removeClass('unblurred');
}, 7000);
});
map.addControl(rsidebar);
lsidebar = L.control.sidebar('lsidebar', {
position: 'left'
});
map.addControl(lsidebar);
// Add in a crosshair for the map
var crosshairIcon = L.icon({
iconUrl: 'images/crosshair.png',
iconSize: [20, 20], // size of the icon
iconAnchor: [10, 10], // point of the icon which will correspond to marker's location
});
crosshair = new L.marker(map.getCenter(), { icon: crosshairIcon, clickable: false });
crosshair.addTo(map);
// Initialize the FeatureGroup to store editable layers
drawnItems = new L.FeatureGroup();
map.addLayer(drawnItems);
// Initialize the draw control and pass it the FeatureGroup of editable layers
drawControl = new L.Control.Draw({
edit: {
featureGroup: drawnItems
},
draw: {
polyline: false,
polygon: false,
circle: false,
marker: false
}
});
map.addControl(drawControl);
/*
**
** create bounds layer
** and default it at first
** to draw on null island
** so it's not seen onload
**
*/
startBounds = new L.LatLngBounds([0.0, 0.0], [0.0, 0.0]);
var bounds = new L.Rectangle(startBounds,
{
fill: false,
opacity: 1.0,
color: '#000'
}
);
bounds.on('bounds-set', function (e) {
// move it to the end of the parent
var parent = e.target._renderer._container.parentElement;
$(parent).append(e.target._renderer._container);
// Set the hash
var southwest = this.getBounds().getSouthWest();
var northeast = this.getBounds().getNorthEast();
var xmin = southwest.lng.toFixed(6);
var ymin = southwest.lat.toFixed(6);
var xmax = northeast.lng.toFixed(6);
var ymax = northeast.lat.toFixed(6);
location.hash = ymin + ',' + xmin + ',' + ymax + ',' + xmax;
});
map.addLayer(bounds)
map.on('draw:created', function (e) {
drawnItems.addLayer(e.layer);
bounds.setBounds(drawnItems.getBounds())
$('#boxbounds').text(formatBounds(bounds.getBounds(), '4326'));
$('#boxboundsmerc').text(formatBounds(bounds.getBounds(), currentproj));
notifyBboxUpdate();
if (!e.geojson &&
!((drawnItems.getLayers().length == 1) && (drawnItems.getLayers()[0] instanceof L.Marker))) {
map.fitBounds(bounds.getBounds());
} else {
if ((drawnItems.getLayers().length == 1) && (drawnItems.getLayers()[0] instanceof L.Marker)) {
map.panTo(drawnItems.getLayers()[0].getLatLng());
}
}
});
map.on('draw:deleted', function (e) {
e.layers.eachLayer(function (l) {
drawnItems.removeLayer(l);
});
if (drawnItems.getLayers().length > 0 &&
!((drawnItems.getLayers().length == 1) && (drawnItems.getLayers()[0] instanceof L.Marker))) {
bounds.setBounds(drawnItems.getBounds())
$('#boxbounds').text(formatBounds(bounds.getBounds(), '4326'));
$('#boxboundsmerc').text(formatBounds(bounds.getBounds(), currentproj));
notifyBboxUpdate();
map.fitBounds(bounds.getBounds());
} else {
bounds.setBounds(new L.LatLngBounds([0.0, 0.0], [0.0, 0.0]));
$('#boxbounds').text(formatBounds(bounds.getBounds(), '4326'));
$('#boxboundsmerc').text(formatBounds(bounds.getBounds(), currentproj));
notifyBboxUpdate();
if (drawnItems.getLayers().length == 1) {
map.panTo(drawnItems.getLayers()[0].getLatLng());
}
}
});
map.on('draw:edited', function (e) {
bounds.setBounds(drawnItems.getBounds())
$('#boxbounds').text(formatBounds(bounds.getBounds(), '4326'));
$('#boxboundsmerc').text(formatBounds(bounds.getBounds(), currentproj));
notifyBboxUpdate();
map.fitBounds(bounds.getBounds());
});
function display() {
$('#boxbounds').text(formatBounds(bounds.getBounds(), '4326'));
$('#boxboundsmerc').text(formatBounds(bounds.getBounds(), currentproj));
notifyBboxUpdate();
}
display();
map.on('move', function (e) {
crosshair.setLatLng(map.getCenter());
});
// handle geolocation click events
$('#geolocation').click(function () {
map.locate({ setView: true, maxZoom: 8 });
$('#geolocation a').toggleClass('active');
$('#geolocation a').toggleClass('active', 350);
});
$('button#add').on('click', function (evt) {
var sniffer = FormatSniffer({ data: $('div#rsidebar textarea').val() });
var is_valid = sniffer.sniff();
if (is_valid) {
rsidebar.hide();
$('#create-geojson a').toggleClass('enabled');
map.fitBounds(bounds.getBounds());
}
});
$('button#clear').on('click', function (evt) {
$('div#rsidebar textarea').val('');
});
var initialBBox = location.hash ? location.hash.replace(/^#/, '') : null;
if (initialBBox) {
if (validateStringAsBounds(initialBBox)) {
var splitBounds = initialBBox.split(',');
startBounds = new L.LatLngBounds([splitBounds[0], splitBounds[1]],
[splitBounds[2], splitBounds[3]]);
var lyr = new L.Rectangle(startBounds);
var evt = {
layer: lyr,
layerType: "polygon",
}
map.fire('draw:created', evt);
//map.fitBounds(bounds.getBounds());
} else {
// This will reset the hash if the original hash was not valid
bounds.setBounds(bounds.getBounds());
}
} else {
// Initially set the hash if there was not one set by the user
bounds.setBounds(bounds.getBounds());
}
$("input").click(function (e) {
display();
});
});
function notifyBboxUpdate() {
const bboxText = document.getElementById('boxbounds').textContent;
window.parent.postMessage({ bboxText: bboxText }, '*');
}

9597
gui-src/js/libs/jquery-1.9.1.js vendored Normal file
View File

File diff suppressed because it is too large Load Diff

5
gui-src/js/libs/jquery-1.9.1.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

14971
gui-src/js/libs/jquery-ui-1.10.3.custom.js vendored Normal file
View File

File diff suppressed because it is too large Load Diff

View File

File diff suppressed because one or more lines are too long

81
gui-src/js/license.js vendored Normal file
View File

@@ -0,0 +1,81 @@
export const licenseText = `
<p><b>Contributors:</b></p>
louis-e (Louis Erbkamm)<br>
scd31<br>
amir16yp<br>
vfosnar<br>
TheComputerGuy96<br>
zer0-dev<br>
RedAuburn<br>
daniil2327<br>
benjamin051000<br>
<p>For a full list of contributors, please refer to the <a href="https://github.com/louis-e/arnis" style="color: inherit;" target="_blank">Github page</a>. Logo made by nxfx21.</p>
<p style="color: #ff7070;"><b>Download Arnis only from the official source:</b> <a href="https://github.com/louis-e/arnis" style="color: inherit;" target="_blank">https://github.com/louis-e/arnis/</a>. Every other website providing a download and claiming to be affiliated with the project is unofficial and may be malicious.</p>
<p><b>License:</b></p>
<pre style="white-space: pre-wrap; font-family: inherit;">
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized bythe copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and allother entities that control, are controlled by, or are under commoncontrol with that entity. For the purposes of this definition,"control" means (i) the power, direct or indirect, to cause thedirection or management of such entity, whether by contract orotherwise, or (ii) ownership of fifty percent (50%) or more of theoutstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entityexercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,including but not limited to software source code, documentationsource, and configuration files.
"Object" form shall mean any form resulting from mechanicaltransformation or translation of a Source form, including butnot limited to compiled object code, generated documentation,and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source orObject form, made available under the License, as indicated by acopyright notice that is included in or attached to the work(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Objectform, that is based on (or derived from) the Work and for which theeditorial revisions, annotations, elaborations, or other modificationsrepresent, as a whole, an original work of authorship. For the purposesof this License, Derivative Works shall not include works that remainseparable from, or merely link (or bind by name) to the interfaces of,the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, includingthe original version of the Work and any modifications or additionsto that Work or Derivative Works thereof, that is intentionallysubmitted to Licensor for inclusion in the Work by the copyright owneror by an individual or Legal Entity authorized to submit on behalf ofthe copyright owner. For the purposes of this definition, "submitted"means any form of electronic, verbal, or written communication sentto the Licensor or its representatives, including but not limited tocommunication on electronic mailing lists, source code control systems,and issue tracking systems that are managed by, or on behalf of, theLicensor for the purpose of discussing and improving the Work, butexcluding communication that is conspicuously marked or otherwisedesignated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entityon behalf of whom a Contribution has been received by Licensor andsubsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions ofthis License, each Contributor hereby grants to You a perpetual,worldwide, non-exclusive, no-charge, royalty-free, irrevocablecopyright license to reproduce, prepare Derivative Works of,publicly display, publicly perform, sublicense, and distribute theWork and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions ofthis License, each Contributor hereby grants to You a perpetual,worldwide, non-exclusive, no-charge, royalty-free, irrevocable(except as stated in this section) patent license to make, have made,use, offer to sell, sell, import, and otherwise transfer the Work,where such license applies only to those patent claims licensableby such Contributor that are necessarily infringed by theirContribution(s) alone or by combination of their Contribution(s)with the Work to which such Contribution(s) was submitted. If Youinstitute patent litigation against any entity (including across-claim or counterclaim in a lawsuit) alleging that the Workor a Contribution incorporated within the Work constitutes director contributory patent infringement, then any patent licensesgranted to You under this License for that Work shall terminateas of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of theWork or Derivative Works thereof in any medium, with or withoutmodifications, and in Source or Object form, provided that Youmeet the following conditions:
(a) You must give any other recipients of the Work or Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
You may add Your own copyright statement to Your modifications andmay provide additional or different license terms and conditionsfor use, reproduction, or distribution of Your modifications, orfor any such Derivative Works as a whole, provided Your use,reproduction, and distribution of the Work otherwise complies withthe conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,any Contribution intentionally submitted for inclusion in the Workby You to the Licensor shall be under the terms and conditions ofthis License, without any additional terms or conditions.Notwithstanding the above, nothing herein shall supersede or modifythe terms of any separate license agreement you may have executedwith Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the tradenames, trademarks, service marks, or product names of the Licensor,except as required for reasonable and customary use in describing theorigin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law oragreed to in writing, Licensor provides the Work (and eachContributor provides its Contributions) on an "AS IS" BASIS,WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express orimplied, including, without limitation, any warranties or conditionsof TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR APARTICULAR PURPOSE. You are solely responsible for determining theappropriateness of using or redistributing the Work and assume anyrisks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,whether in tort (including negligence), contract, or otherwise,unless required by applicable law (such as deliberate and grosslynegligent acts) or agreed to in writing, shall any Contributor beliable to You for damages, including any direct, indirect, special,incidental, or consequential damages of any character arising as aresult of this License or out of the use or inability to use theWork (including but not limited to damages for loss of goodwill,work stoppage, computer failure or malfunction, or any and allother commercial damages or losses), even if such Contributorhas been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributingthe Work or Derivative Works thereof, You may choose to offer,and charge a fee for, acceptance of support, warranty, indemnity,or other liability obligations and/or rights consistent with thisLicense. However, in accepting such obligations, You may act onlyon Your own behalf and on Your sole responsibility, not on behalfof any other Contributor, and only if You agree to indemnify,defend, and hold each Contributor harmless for any liabilityincurred by, or claims asserted against, such Contributor by reasonof your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
Copyright ${new Date().getFullYear()} Louis Erbkamm
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License athttp://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions andlimitations under the License.
</pre>
`;

511
gui-src/js/main.js vendored Normal file
View File

@@ -0,0 +1,511 @@
import { licenseText } from './license.js';
let invoke;
if (window.__TAURI__) {
invoke = window.__TAURI__.core.invoke;
} else {
function dummyFunc() {}
window.__TAURI__ = { event: { listen: dummyFunc } };
invoke = dummyFunc;
}
const DEFAULT_LOCALE_PATH = `./locales/en.json`;
// Initialize elements and start the demo progress
window.addEventListener("DOMContentLoaded", async () => {
registerMessageEvent();
window.selectWorld = selectWorld;
window.startGeneration = startGeneration;
setupProgressListener();
initSettings();
initWorldPicker();
handleBboxInput();
const localization = await getLocalization();
await applyLocalization(localization);
initFooter();
await checkForUpdates();
});
/**
* Checks if a JSON response is invalid or falls back to HTML
* @param {Response} response - The fetch response object
* @returns {boolean} True if the response is invalid JSON
*/
function invalidJSON(response) {
// Workaround for Tauri always falling back to index.html for asset loading
return !response.ok || response.headers.get("Content-Type") === "text/html";
}
/**
* Fetches and returns localization data based on user's language
* Falls back to English if requested language is not available
* @returns {Promise<Object>} The localization JSON object
*/
async function getLocalization() {
const lang = navigator.language;
let response = await fetch(`./locales/${lang}.json`);
// Try with only first part of language code
if (invalidJSON(response)) {
response = await fetch(`./locales/${lang.split('-')[0]}.json`);
// Fallback to default English localization
if (invalidJSON(response)) {
response = await fetch(DEFAULT_LOCALE_PATH);
}
}
const localization = await response.json();
return localization;
}
/**
* Updates an HTML element with localized text
* @param {Object} json - Localization data
* @param {Object} elementObject - Object containing element or selector
* @param {string} localizedStringKey - Key for the localized string
*/
async function localizeElement(json, elementObject, localizedStringKey) {
const element =
(!elementObject.element || elementObject.element === "")
? document.querySelector(elementObject.selector) : elementObject.element;
const attribute = localizedStringKey.startsWith("placeholder_") ? "placeholder" : "textContent";
if (element) {
if (localizedStringKey in json) {
element[attribute] = json[localizedStringKey];
} else {
// Fallback to default (English) string
const response = await fetch(DEFAULT_LOCALE_PATH);
const defaultJson = await response.json();
element[attribute] = defaultJson[localizedStringKey];
}
}
}
async function applyLocalization(localization) {
const localizationElements = {
"h2[data-localize='select_location']": "select_location",
"#bbox-text": "zoom_in_and_choose",
"h2[data-localize='select_world']": "select_world",
"span[id='choose_world']": "choose_world",
"#selected-world": "no_world_selected",
"#start-button": "start_generation",
"h2[data-localize='progress']": "progress",
"h2[data-localize='choose_world_modal_title']": "choose_world_modal_title",
"button[data-localize='select_existing_world']": "select_existing_world",
"button[data-localize='generate_new_world']": "generate_new_world",
"h2[data-localize='customization_settings']": "customization_settings",
"label[data-localize='world_scale']": "world_scale",
"label[data-localize='custom_bounding_box']": "custom_bounding_box",
"label[data-localize='floodfill_timeout']": "floodfill_timeout",
"label[data-localize='ground_level']": "ground_level",
".footer-link": "footer_text",
"button[data-localize='license_and_credits']": "license_and_credits",
"h2[data-localize='license_and_credits']": "license_and_credits",
// Placeholder strings
"input[id='bbox-coords']": "placeholder_bbox",
"input[id='floodfill-timeout']": "placeholder_floodfill",
"input[id='ground-level']": "placeholder_ground"
};
for (const selector in localizationElements) {
localizeElement(localization, { selector: selector }, localizationElements[selector]);
}
// Update error messages
window.localization = localization;
}
// Function to initialize the footer with the current year and version
async function initFooter() {
const currentYear = new Date().getFullYear();
let version = "x.x.x";
try {
version = await invoke('gui_get_version');
} catch (error) {
console.error("Failed to fetch version:", error);
}
const footerElement = document.querySelector(".footer-link");
if (footerElement) {
footerElement.textContent =
footerElement.textContent
.replace("{year}", currentYear)
.replace("{version}", version);
}
}
// Function to check for updates and display a notification if available
async function checkForUpdates() {
try {
const isUpdateAvailable = await invoke('gui_check_for_updates');
if (isUpdateAvailable) {
const footer = document.querySelector(".footer");
const updateMessage = document.createElement("a");
updateMessage.href = "https://github.com/louis-e/arnis/releases";
updateMessage.target = "_blank";
updateMessage.style.color = "#fecc44";
updateMessage.style.marginTop = "-5px";
updateMessage.style.fontSize = "0.95em";
updateMessage.style.display = "block";
updateMessage.style.textDecoration = "none";
localizeElement(window.localization, { element: updateMessage }, "new_version_available");
footer.style.marginTop = "15px";
footer.appendChild(updateMessage);
}
} catch (error) {
console.error("Failed to check for updates: ", error);
}
}
// Function to register the event listener for bbox updates from iframe
function registerMessageEvent() {
window.addEventListener('message', function (event) {
const bboxText = event.data.bboxText;
if (bboxText) {
console.log("Updated BBOX Coordinates:", bboxText);
displayBboxInfoText(bboxText);
}
});
}
// Function to set up the progress bar listener
function setupProgressListener() {
const progressBar = document.getElementById("progress-bar");
const progressMessage = document.getElementById("progress-message");
const progressDetail = document.getElementById("progress-detail");
window.__TAURI__.event.listen("progress-update", (event) => {
const { progress, message } = event.payload;
if (progress != -1) {
progressBar.style.width = `${progress}%`;
progressDetail.textContent = `${Math.round(progress)}%`;
}
if (message != "") {
progressMessage.textContent = message;
if (message.startsWith("Error!")) {
progressMessage.style.color = "#fa7878";
generationButtonEnabled = true;
} else if (message.startsWith("Done!")) {
progressMessage.style.color = "#7bd864";
generationButtonEnabled = true;
} else {
progressMessage.style.color = "";
}
}
});
}
function initSettings() {
// Settings
const settingsModal = document.getElementById("settings-modal");
const slider = document.getElementById("scale-value-slider");
const sliderValue = document.getElementById("slider-value");
// Open settings modal
function openSettings() {
settingsModal.style.display = "flex";
settingsModal.style.justifyContent = "center";
settingsModal.style.alignItems = "center";
}
// Close settings modal
function closeSettings() {
settingsModal.style.display = "none";
}
window.openSettings = openSettings;
window.closeSettings = closeSettings;
// Update slider value display
slider.addEventListener("input", () => {
sliderValue.textContent = parseFloat(slider.value).toFixed(2);
});
/// License and Credits
function openLicense() {
const licenseModal = document.getElementById("license-modal");
const licenseContent = document.getElementById("license-content");
// Render the license text as HTML
licenseContent.innerHTML = licenseText;
// Show the modal
licenseModal.style.display = "flex";
licenseModal.style.justifyContent = "center";
licenseModal.style.alignItems = "center";
}
function closeLicense() {
const licenseModal = document.getElementById("license-modal");
licenseModal.style.display = "none";
}
window.openLicense = openLicense;
window.closeLicense = closeLicense;
}
function initWorldPicker() {
// World Picker
const worldPickerModal = document.getElementById("world-modal");
// Open world picker modal
function openWorldPicker() {
worldPickerModal.style.display = "flex";
worldPickerModal.style.justifyContent = "center";
worldPickerModal.style.alignItems = "center";
}
// Close world picker modal
function closeWorldPicker() {
worldPickerModal.style.display = "none";
}
window.openWorldPicker = openWorldPicker;
window.closeWorldPicker = closeWorldPicker;
}
/**
* Validates and processes bounding box coordinates input
* Supports both comma and space-separated formats
* Updates the map display when valid coordinates are entered
*/
function handleBboxInput() {
const inputBox = document.getElementById("bbox-coords");
const bboxInfo = document.getElementById("bbox-info");
inputBox.addEventListener("input", function () {
const input = inputBox.value.trim();
if (input === "") {
bboxInfo.textContent = "";
bboxInfo.style.color = "";
selectedBBox = "";
return;
}
// Regular expression to validate bbox input (supports both comma and space-separated formats)
const bboxPattern = /^(-?\d+(\.\d+)?)[,\s](-?\d+(\.\d+)?)[,\s](-?\d+(\.\d+)?)[,\s](-?\d+(\.\d+)?)$/;
if (bboxPattern.test(input)) {
const matches = input.match(bboxPattern);
// Extract coordinates (Lat / Lng order expected)
const lat1 = parseFloat(matches[1]);
const lng1 = parseFloat(matches[3]);
const lat2 = parseFloat(matches[5]);
const lng2 = parseFloat(matches[7]);
// Validate latitude and longitude ranges in the expected Lat / Lng order
if (
lat1 >= -90 && lat1 <= 90 &&
lng1 >= -180 && lng1 <= 180 &&
lat2 >= -90 && lat2 <= 90 &&
lng2 >= -180 && lng2 <= 180
) {
// Input is valid; trigger the event with consistent comma-separated format
const bboxText = `${lat1},${lng1},${lat2},${lng2}`;
window.dispatchEvent(new MessageEvent('message', { data: { bboxText } }));
// Show custom bbox on the map
let map_container = document.querySelector('.map-container');
map_container.setAttribute('src', `maps.html#${lat1},${lng1},${lat2},${lng2}`);
map_container.contentWindow.location.reload();
// Update the info text
localizeElement(window.localization, { element: bboxInfo }, "custom_selection_confirmed");
bboxInfo.style.color = "#7bd864";
} else {
// Valid numbers but invalid order or range
localizeElement(window.localization, { element: bboxInfo }, "error_coordinates_out_of_range");
bboxInfo.style.color = "#fecc44";
selectedBBox = "";
}
} else {
// Input doesn't match the required format
localizeElement(window.localization, { element: bboxInfo }, "invalid_format");
bboxInfo.style.color = "#fecc44";
selectedBBox = "";
}
});
}
/**
* Calculates the approximate area of a bounding box in square meters
* Uses the Haversine formula for geodesic calculations
* @param {number} lng1 - First longitude coordinate
* @param {number} lat1 - First latitude coordinate
* @param {number} lng2 - Second longitude coordinate
* @param {number} lat2 - Second latitude coordinate
* @returns {number} Area in square meters
*/
function calculateBBoxSize(lng1, lat1, lng2, lat2) {
// Approximate distance calculation using Haversine formula or geodesic formula
const toRad = (angle) => (angle * Math.PI) / 180;
const R = 6371000; // Earth radius in meters
const latDistance = toRad(lat2 - lat1);
const lngDistance = toRad(lng2 - lng1);
const a = Math.sin(latDistance / 2) * Math.sin(latDistance / 2) +
Math.cos(toRad(lat1)) * Math.cos(toRad(lat2)) *
Math.sin(lngDistance / 2) * Math.sin(lngDistance / 2);
const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
// Width and height of the box
const height = R * latDistance;
const width = R * lngDistance;
return Math.abs(width * height);
}
/**
* Normalizes a longitude value to the range [-180, 180]
* @param {number} lon - Longitude value to normalize
* @returns {number} Normalized longitude value
*/
function normalizeLongitude(lon) {
return ((lon + 180) % 360 + 360) % 360 - 180;
}
const threshold1 = 30000000.00;
const threshold2 = 45000000.00;
let selectedBBox = "";
// Function to handle incoming bbox data
function displayBboxInfoText(bboxText) {
let [lng1, lat1, lng2, lat2] = bboxText.split(" ").map(Number);
// Normalize longitudes
lat1 = parseFloat(normalizeLongitude(lat1).toFixed(6));
lat2 = parseFloat(normalizeLongitude(lat2).toFixed(6));
selectedBBox = `${lng1} ${lat1} ${lng2} ${lat2}`;
const bboxInfo = document.getElementById("bbox-info");
// Reset the info text if the bbox is 0,0,0,0
if (lng1 === 0 && lat1 === 0 && lng2 === 0 && lat2 === 0) {
bboxInfo.textContent = "";
selectedBBox = "";
return;
}
// Calculate the size of the selected bbox
const selectedSize = calculateBBoxSize(lng1, lat1, lng2, lat2);
if (selectedSize > threshold2) {
localizeElement(window.localization, { element: bboxInfo }, "area_too_large");
bboxInfo.style.color = "#fa7878";
} else if (selectedSize > threshold1) {
localizeElement(window.localization, { element: bboxInfo }, "area_extensive");
bboxInfo.style.color = "#fecc44";
} else {
localizeElement(window.localization, { element: bboxInfo }, "selection_confirmed");
bboxInfo.style.color = "#7bd864";
}
}
let worldPath = "";
let isNewWorld = false;
async function selectWorld(generate_new_world) {
try {
const worldName = await invoke('gui_select_world', { generateNew: generate_new_world } );
if (worldName) {
worldPath = worldName;
isNewWorld = generate_new_world;
const lastSegment = worldName.split(/[\\/]/).pop();
document.getElementById('selected-world').textContent = lastSegment;
document.getElementById('selected-world').style.color = "#fecc44";
}
} catch (error) {
handleWorldSelectionError(error);
}
closeWorldPicker();
}
/**
* Handles world selection errors and displays appropriate messages
* @param {number} errorCode - Error code from the backend
*/
function handleWorldSelectionError(errorCode) {
const errorKeys = {
1: "minecraft_directory_not_found",
2: "world_in_use",
3: "failed_to_create_world",
4: "no_world_selected_error"
};
const errorKey = errorKeys[errorCode] || "unknown_error";
const selectedWorld = document.getElementById('selected-world');
localizeElement(window.localization, { element: selectedWorld }, errorKey);
selectedWorld.style.color = "#fa7878";
worldPath = "";
console.error(errorCode);
}
let generationButtonEnabled = true;
/**
* Initiates the world generation process
* Validates required inputs and sends generation parameters to the backend
* @returns {Promise<void>}
*/
async function startGeneration() {
try {
if (generationButtonEnabled === false) {
return;
}
if (!selectedBBox || selectedBBox == "0.000000 0.000000 0.000000 0.000000") {
const bboxInfo = document.getElementById('bbox-info');
localizeElement(window.localization, { element: bboxInfo }, "select_location_first");
bboxInfo.style.color = "#fa7878";
return;
}
if (!worldPath || worldPath === "") {
const selectedWorld = document.getElementById('selected-world');
localizeElement(window.localization, { element: selectedWorld }, "select_minecraft_world_first");
selectedWorld.style.color = "#fa7878";
return;
}
var terrain = document.getElementById("terrain-toggle").checked;
var fill_ground = document.getElementById("fillground-toggle").checked;
var scale = parseFloat(document.getElementById("scale-value-slider").value);
var floodfill_timeout = parseInt(document.getElementById("floodfill-timeout").value, 10);
var ground_level = parseInt(document.getElementById("ground-level").value, 10);
// Validate floodfill_timeout and ground_level
floodfill_timeout = isNaN(floodfill_timeout) || floodfill_timeout < 0 ? 20 : floodfill_timeout;
ground_level = isNaN(ground_level) || ground_level < -62 ? 20 : ground_level;
// Pass the bounding box and selected world to the Rust backend
await invoke("gui_start_generation", {
bboxText: selectedBBox,
selectedWorld: worldPath,
worldScale: scale,
groundLevel: ground_level,
floodfillTimeout: floodfill_timeout,
terrainEnabled: terrain,
fillgroundEnabled: fill_ground,
isNewWorld: isNewWorld
});
console.log("Generation process started.");
generationButtonEnabled = false;
} catch (error) {
console.error("Error starting generation:", error);
generationButtonEnabled = true;
}
}

9180
gui-src/js/maps/leaflet-src.js vendored Normal file
View File

File diff suppressed because it is too large Load Diff

2766
gui-src/js/maps/leaflet.draw-src.js vendored Normal file
View File

File diff suppressed because it is too large Load Diff

10
gui-src/js/maps/leaflet.draw.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

9
gui-src/js/maps/leaflet.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

122
gui-src/js/maps/leaflet.sidebar.js vendored Normal file
View File

@@ -0,0 +1,122 @@
L.Control.Sidebar = L.Control.extend({
includes: L.Mixin.Events,
options: {
closeButton: true,
position: 'left'
},
initialize: function (placeholder, options) {
L.setOptions(this, options);
// Find content container
var content = this._contentContainer = L.DomUtil.get(placeholder);
// Remove the content container from its original parent
content.parentNode.removeChild(content);
// Make sure we don't drag the map when we interact with the content
var stop = L.DomEvent.stopPropagation;
L.DomEvent
.on(content, 'click', stop)
.on(content, 'mousedown', stop)
.on(content, 'touchstart', stop)
.on(content, 'dblclick', stop)
.on(content, 'mousewheel', stop)
.on(content, 'MozMousePixelScroll', stop);
},
addTo: function (map) {
var sidebar = this;
var l = 'leaflet-';
// Create sidebar container
var container = this._container =
L.DomUtil.create('div', l + 'sidebar ' + this.options.position);
// Style and attach content container
var content = this._contentContainer;
L.DomUtil.addClass(content, l + 'control');
container.appendChild(content);
// Create close button and attach it if configured
if (this.options.closeButton) {
var close = L.DomUtil.create('a', 'close', container);
close.innerHTML = '&times;';
L.DomEvent.on(close, 'click', function (e) {
sidebar.hide();
L.DomEvent.stopPropagation(e);
});
}
// Attach sidebar container to controls container
var controlContainer = map._controlContainer;
controlContainer.insertBefore(container, controlContainer.firstChild);
this._map = map;
return this;
},
removeFrom: function (map) {
// Remove sidebar container from controls container
var controlContainer = map._controlContainer;
controlContainer.removeChild(this._container);
return this;
},
isVisible: function () {
return L.DomUtil.hasClass(this._container, 'visible');
},
show: function () {
if (!this.isVisible()) {
L.DomUtil.addClass(this._container, 'visible');
//this._map.panBy([-this.getOffset() / 2, 0], {
// duration: 0.5
//});
this.fire("sidebar-show");
}
},
hide: function () {
if (this.isVisible()) {
L.DomUtil.removeClass(this._container, 'visible');
//this._map.panBy([this.getOffset() / 2, 0], {
// duration: 0.5
//});
this.fire("sidebar-hide");
}
},
toggle: function () {
if (this.isVisible()) {
this.hide();
} else {
this.show();
}
},
getContainer: function () {
return this._contentContainer;
},
setContent: function (content) {
this.getContainer().innerHTML = content;
return this;
},
getOffset: function () {
if (this.options.position === 'right') {
return -this._container.offsetWidth;
} else {
return this._container.offsetWidth;
}
}
});
L.control.sidebar = function (placeholder, options) {
return new L.Control.Sidebar(placeholder, options);
};

3
gui-src/js/maps/mapbox.standalone.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

66
gui-src/js/maps/mapbox.v3.2.0.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

5733
gui-src/js/maps/proj4-src.js vendored Normal file
View File

File diff suppressed because it is too large Load Diff

3
gui-src/js/maps/proj4.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

227
gui-src/js/maps/proj4leaflet.js vendored Normal file
View File

@@ -0,0 +1,227 @@
(function (factory) {
var L, proj4;
if (typeof define === 'function' && define.amd) {
// AMD
define(['leaflet', 'proj4'], factory);
} else if (typeof module !== 'undefined') {
// Node/CommonJS
L = require('leaflet');
proj4 = require('proj4');
module.exports = factory(L, proj4);
} else {
// Browser globals
if (typeof window.L === 'undefined' || typeof window.proj4 === 'undefined')
throw "Leaflet and proj4 must be loaded first";
factory(window.L, window.proj4);
}
}(function (L, proj4) {
L.Proj = {};
L.Proj._isProj4Obj = function(a) {
return (typeof a['inverse'] !== 'undefined'
&& typeof a['forward'] !== 'undefined');
};
L.Proj.ScaleDependantTransformation = function(scaleTransforms) {
this.scaleTransforms = scaleTransforms;
}
L.Proj.ScaleDependantTransformation.prototype.transform = function(point, scale) {
return this.scaleTransforms[scale].transform(point, scale);
};
L.Proj.ScaleDependantTransformation.prototype.untransform = function(point, scale) {
return this.scaleTransforms[scale].untransform(point, scale);
};
L.Proj.Projection = L.Class.extend({
initialize: function(a, def) {
if (L.Proj._isProj4Obj(a)) {
this._proj = a;
} else {
var code = a;
if (def) {
proj4.defs(code, def);
} else if (proj4.defs[code] === undefined) {
var urn = code.split(':');
if (urn.length > 3)
code = urn[urn.length - 3] + ':' + urn[urn.length - 1];
if (proj4.defs[code] === undefined)
throw "No projection definition for code " + code;
}
this._proj = proj4(code);
}
},
project: function (latlng) {
var point = this._proj.forward([latlng.lng, latlng.lat]);
return new L.Point(point[0], point[1]);
},
unproject: function (point, unbounded) {
var point2 = this._proj.inverse([point.x, point.y]);
return new L.LatLng(point2[1], point2[0], unbounded);
}
});
L.Proj.CRS = L.Class.extend({
includes: L.CRS,
options: {
transformation: new L.Transformation(1, 0, -1, 0)
},
initialize: function(a, b, c) {
var code, proj, def, options;
if (L.Proj._isProj4Obj(a)) {
proj = a;
code = proj.srsCode;
options = b || {};
this.projection = new L.Proj.Projection(proj);
} else {
code = a;
def = b;
options = c || {};
this.projection = new L.Proj.Projection(code, def);
}
L.Util.setOptions(this, options);
this.code = code;
this.transformation = this.options.transformation;
if (this.options.origin) {
this.transformation =
new L.Transformation(1, -this.options.origin[0],
-1, this.options.origin[1]);
}
if (this.options.scales) {
this.scale = function(zoom) {
return this.options.scales[zoom];
}
} else if (this.options.resolutions) {
this.scale = function(zoom) {
return 1 / this.options.resolutions[zoom];
}
}
}
});
L.Proj.CRS.TMS = L.Proj.CRS.extend({
initialize: function(a, b, c, d) {
if (L.Proj._isProj4Obj(a)) {
var proj = a,
projectedBounds = b,
options = c || {};
options.origin = [projectedBounds[0], projectedBounds[3]];
L.Proj.CRS.prototype.initialize.call(this, proj, options);
} else {
var code = a,
def = b,
projectedBounds = c,
options = d || {};
options.origin = [projectedBounds[0], projectedBounds[3]];
L.Proj.CRS.prototype.initialize.call(this, code, def, options);
}
this.projectedBounds = projectedBounds;
}
});
L.Proj.TileLayer = {};
L.Proj.TileLayer.TMS = L.TileLayer.extend({
options: {
tms: true,
continuousWorld: true
},
initialize: function(urlTemplate, crs, options) {
var boundsMatchesGrid = true,
scaleTransforms,
upperY,
crsBounds;
if (!(crs instanceof L.Proj.CRS.TMS)) {
throw new Error("CRS is not L.Proj.CRS.TMS.");
}
L.TileLayer.prototype.initialize.call(this, urlTemplate, options);
this.crs = crs;
crsBounds = this.crs.projectedBounds;
// Verify grid alignment
for (var i = this.options.minZoom; i < this.options.maxZoom && boundsMatchesGrid; i++) {
var gridHeight = (crsBounds[3] - crsBounds[1]) /
this._projectedTileSize(i);
boundsMatchesGrid = Math.abs(gridHeight - Math.round(gridHeight)) > 1e-3;
}
if (!boundsMatchesGrid) {
scaleTransforms = {};
for (var i = this.options.minZoom; i < this.options.maxZoom; i++) {
upperY = crsBounds[1] + Math.ceil((crsBounds[3] - crsBounds[1]) /
this._projectedTileSize(i)) * this._projectedTileSize(i);
scaleTransforms[this.crs.scale(i)] = new L.Transformation(1, -crsBounds[0], -1, upperY);
}
this.crs = new L.Proj.CRS.TMS(this.crs.projection._proj, crsBounds, this.crs.options);
this.crs.transformation = new L.Proj.ScaleDependantTransformation(scaleTransforms);
}
},
getTileUrl: function(tilePoint, zoom) {
var gridHeight = Math.ceil(
(this.crs.projectedBounds[3] - this.crs.projectedBounds[1]) /
this._projectedTileSize(zoom)
);
return L.Util.template(this._url, L.Util.extend({
s: this._getSubdomain(tilePoint),
z: zoom,
x: tilePoint.x,
y: gridHeight - tilePoint.y - 1
}, this.options));
},
_projectedTileSize: function(zoom) {
return (this.options.tileSize / this.crs.scale(zoom));
}
});
L.Proj.GeoJSON = L.GeoJSON.extend({
initialize: function(geojson, options) {
if (geojson.crs && geojson.crs.type == 'name') {
var crs = new L.Proj.CRS(geojson.crs.properties.name)
options = options || {};
options.coordsToLatLng = function(coords) {
var point = L.point(coords[0], coords[1]);
return crs.projection.unproject(point);
};
}
L.GeoJSON.prototype.initialize.call(this, geojson, options);
}
});
L.Proj.geoJson = function(geojson, options) {
return new L.Proj.GeoJSON(geojson, options);
};
if (typeof L.CRS !== 'undefined') {
// This is left here for backwards compatibility
L.CRS.proj4js = (function () {
return function (code, def, transformation, options) {
options = options || {};
if (transformation) options.transformation = transformation;
return new L.Proj.CRS(code, def, options);
};
}());
}
return L.Proj;
}));

158
gui-src/js/maps/test.runner.js vendored Normal file
View File

@@ -0,0 +1,158 @@
(function( definition ) { // execute immeidately
if ( typeof module !== 'undefined' &&
typeof module.exports !== 'undefined' ) {
module.exports = definition();
}
else if ( typeof window === "object" ) {
// example run syntax: BBOX_T( { 'url' : '/js/maps/testdata.js' } );
window.BBOX_T = definition();
}
})( function() {
'use strict';
/*
**
** constructor
**
*/
var TestRunner = function( options ) {
options || ( options = {} );
if( !this || !(this instanceof TestRunner )){
return new TestRunner( options );
}
this.test_url = options.url || "";
this.global_setup(); // execute immediately
};
/*
**
** functions
**
*/
TestRunner.prototype.global_setup = function() {
var self = this; // hold ref to instance
$.ajax({
'url' : this.test_url ,
'dataType' : 'json'
})
.done( function( json_data ) {
self.run_this_mother.call( self, json_data );
})
.fail( function( error ) {
console.log( "The test data didn't load: ", error );
});
};
TestRunner.prototype.single_setup = function() {
this.get_layer_count();
};
TestRunner.prototype.tear_down = function() {
if( this._draw_delete_handler ){
this._draw_delete_handler.off('draw:deleted');
}
};
TestRunner.prototype.run_this_mother = function( json_data ) {
for( var key in json_data ){
console.log( "[ RUNNING ]: test " + json_data[key]['type'] + "->" + "simple=" + json_data[key]['simple'] );
var data = json_data[key]['data'];
if( json_data[key]['type'] === 'geojson' ) {
data = JSON.stringify( data );
}
/*
** run different tests
** the context here is jQuery, so change
** to reference the instance
*/
this.single_setup();
this.test_parsing( data, json_data );
this.test_add2map( json_data );
this.test_deletable( json_data );
this.tear_down();
}
};
TestRunner.prototype.test_deletable = function(identifier){ // TODO: this needs work
var toolbar = null;
// get the right toolbar, depending on attributes
for( var key in drawControl._toolbars ){
var tbar = drawControl._toolbars[key];
if ( !(tbar instanceof L.EditToolbar ) ){
continue;
}
toolbar = tbar; // set the right one;
}
// create delete handler that makes sure things are deleted
this._draw_delete_handler = map.on('draw:deleted', function (e) {
try {
e.layers.eachLayer(function (l) {
drawnItems.removeLayer(l);
});
console.warn( "[ PASSED ]: test_deletable" );
}
catch ( err ) {
console.error( "[ DELETE TEST FAIL ]: ", err.message, identifier );
}
});
// loop through this toolbars featureGroup, delete layers
if ( !toolbar._activeMode ) {
toolbar._modes['remove'].button.click(); // enable deletable
}
for( var indx in toolbar.options['featureGroup']._layers ) {
try {
var lyr = toolbar.options['featureGroup']._layers[indx];
lyr.fire( 'click' ); // triggers delete
}
catch ( err ){
console.error( "[ DELETE TEST FAIL ]: ", err.message, identifier );
}
}
// WTF?
$('a[title="Save changes."]')[0].click(); // disable deletable
};
TestRunner.prototype.test_add2map = function(identifier){
var current_num = Object.keys( map._layers ).length;
if( current_num <= this.num_layers_before_parse ){
console.error( "[ ADD2MAP TEST FAIL ]: ", identifier );
}
else {
console.warn( "[ PASSED ]: test_add2map" );
}
};
TestRunner.prototype.get_layer_count = function(){
this.num_layers_before_parse = Object.keys( map._layers ).length;
};
TestRunner.prototype.test_parsing = function( data, identifier ){
var is_valid = FormatSniffer( { data : data } ).sniff();
if ( !is_valid ) {
console.error( "[ PARSE TEST FAIL ]: ", identifier );
}
else {
console.warn( "[ PASSED ]: test_parsing" );
}
};
return TestRunner; // return class def
});

549
gui-src/js/maps/wkt.parser.js vendored Normal file
View File

@@ -0,0 +1,549 @@
/*
**
** taking only necessary pieces from
** https://raw.github.com/arthur-e/Wicket/master/wicket.src.js
**
*/
var Wkt = (function () { // Execute function immediately
var beginsWith, endsWith;
/**
* Returns true if the substring is found at the beginning of the string.
* @param str {String} The String to search
* @param sub {String} The substring of interest
* @return {Boolean}
* @private
*/
beginsWith = function (str, sub) {
return str.substring(0, sub.length) === sub;
};
/**
* Returns true if the substring is found at the end of the string.
* @param str {String} The String to search
* @param sub {String} The substring of interest
* @return {Boolean}
* @private
*/
endsWith = function (str, sub) {
return str.substring(str.length - sub.length) === sub;
};
return {
/**
* The default delimiter for separating components of atomic geometry (coordinates)
* @ignore
*/
delimiter: ' ',
/**
* Determines whether or not the passed Object is an Array.
* @param obj {Object} The Object in question
* @return {Boolean}
* @member Wkt.isArray
* @method
*/
isArray: function (obj) {
return !!(obj && obj.constructor === Array);
},
/**
* Removes given character String(s) from a String.
* @param str {String} The String to search
* @param sub {String} The String character(s) to trim
* @return {String} The trimmed string
* @member Wkt.trim
* @method
*/
trim: function (str, sub) {
sub = sub || ' '; // Defaults to trimming spaces
// Trim beginning spaces
while (beginsWith(str, sub)) {
str = str.substring(1);
}
// Trim ending spaces
while (endsWith(str, sub)) {
str = str.substring(0, str.length - 1);
}
return str;
},
/**
* An object for reading WKT strings and writing geographic features
* @constructor Wkt.Wkt
* @param initializer {String} An optional WKT string for immediate read
* @property {Array} components - Holder for atomic geometry objects (internal representation of geometric components)
* @property {String} delimiter - The default delimiter for separating components of atomic geometry (coordinates)
* @property {Object} regExes - Some regular expressions copied from OpenLayers.Format.WKT.js
* @property {String} type - The Well-Known Text name (e.g. 'point') of the geometry
* @property {Boolean} wrapVerticies - True to wrap vertices in MULTIPOINT geometries; If true: MULTIPOINT((30 10),(10 30),(40 40)); If false: MULTIPOINT(30 10,10 30,40 40)
* @return {Wkt.Wkt}
* @memberof Wkt
*/
Wkt: function (initializer) {
/**
* The default delimiter between X and Y coordinates.
* @ignore
*/
this.delimiter = Wkt.delimiter;
/**
* Configuration parameter for controlling how Wicket seralizes
* MULTIPOINT strings. Examples; both are valid WKT:
* If true: MULTIPOINT((30 10),(10 30),(40 40))
* If false: MULTIPOINT(30 10,10 30,40 40)
* @ignore
*/
this.wrapVertices = true;
/**
* Some regular expressions copied from OpenLayers.Format.WKT.js
* @ignore
*/
this.regExes = {
'typeStr': /^\s*(\w+)\s*\(\s*(.*)\s*\)\s*$/,
'spaces': /\s+|\+/, // Matches the '+' or the empty space
'numeric': /-*\d+(\.*\d+)?/,
'comma': /\s*,\s*/,
'parenComma': /\)\s*,\s*\(/,
'coord': /-*\d+\.*\d+ -*\d+\.*\d+/, // e.g. "24 -14"
'doubleParenComma': /\)\s*\)\s*,\s*\(\s*\(/,
'trimParens': /^\s*\(?(.*?)\)?\s*$/
};
/**
* The internal representation of geometry--the "components" of geometry.
* @ignore
*/
this.components = undefined;
// An initial WKT string may be provided
if (initializer && typeof initializer === 'string') {
this.read(initializer);
} else if (initializer && typeof initializer !== undefined) {
this.fromObject(initializer);
}
}
};
}());
/**
* Returns true if the internal geometry is a collection of geometries.
* @return {Boolean} Returns true when it is a collection
* @memberof Wkt.Wkt
* @method
*/
Wkt.Wkt.prototype.isCollection = function () {
switch (this.type.slice(0, 5)) {
case 'multi':
// Trivial; any multi-geometry is a collection
return true;
case 'polyg':
// Polygons with holes are "collections" of rings
return true;
default:
// Any other geometry is not a collection
return false;
}
};
/**
* Compares two x,y coordinates for equality.
* @param a {Object} An object with x and y properties
* @param b {Object} An object with x and y properties
* @return {Boolean}
* @memberof Wkt.Wkt
* @method
*/
Wkt.Wkt.prototype.sameCoords = function (a, b) {
return (a.x === b.x && a.y === b.y);
};
/**
* Sets internal geometry (components) from framework geometry (e.g.
* Google Polygon objects or google.maps.Polygon).
* @param obj {Object} The framework-dependent geometry representation
* @return {Wkt.Wkt} The object itself
* @memberof Wkt.Wkt
* @method
*/
Wkt.Wkt.prototype.fromObject = function (obj) {
var result = this.deconstruct.call(this, obj);
this.components = result.components;
this.isRectangle = result.isRectangle || false;
this.type = result.type;
return this;
};
/**
* Creates external geometry objects based on a plug-in framework's
* construction methods and available geometry classes.
* @param config {Object} An optional framework-dependent properties specification
* @return {Object} The framework-dependent geometry representation
* @memberof Wkt.Wkt
* @method
*/
Wkt.Wkt.prototype.toObject = function (config) {
return this.construct[this.type].call(this, config);
};
/**
* Absorbs the geometry of another Wkt.Wkt instance, merging it with its own,
* creating a collection (MULTI-geometry) based on their types, which must agree.
* For example, creates a MULTIPOLYGON from a POLYGON type merged with another
<<<<<<< HEAD
* POLYGON type.
=======
* POLYGON type, or adds a POLYGON instance to a MULTIPOLYGON instance.
>>>>>>> dev
* @memberof Wkt.Wkt
* @method
*/
Wkt.Wkt.prototype.merge = function (wkt) {
var prefix = this.type.slice(0, 5);
if (this.type !== wkt.type) {
if (this.type.slice(5, this.type.length) !== wkt.type) {
throw TypeError('The input geometry types must agree or the calling Wkt.Wkt instance must be a multigeometry of the other');
}
}
switch (prefix) {
case 'point':
this.components = [this.components.concat(wkt.components)];
break;
case 'multi':
this.components = this.components.concat((wkt.type.slice(0, 5) === 'multi') ? wkt.components : [wkt.components]);
break;
default:
this.components = [
this.components,
wkt.components
]
break;
}
if (prefix !== 'multi') {
this.type = 'multi' + this.type;
}
};
/**
* Reads a WKT string, validating and incorporating it.
* @param wkt {String} A WKT string
* @return {Array} An Array of internal geometry objects
* @memberof Wkt.Wkt
* @method
*/
Wkt.Wkt.prototype.read = function (wkt) {
var matches;
matches = this.regExes.typeStr.exec(wkt);
if (matches) {
this.type = matches[1].toLowerCase();
this.base = matches[2];
if (this.ingest[this.type]) {
this.components = this.ingest[this.type].apply(this, [this.base]);
}
} else {
console.log("Invalid WKT string provided to read()");
throw {
name: "WKTError",
message: "Invalid WKT string provided to read()"
};
}
return this.components;
}; // eo readWkt
/**
* This object contains functions as property names that ingest WKT
* strings into the internal representation.
* @memberof Wkt.Wkt
* @namespace Wkt.Wkt.ingest
* @instance
*/
Wkt.Wkt.prototype.ingest = {
/**
* Return point feature given a point WKT fragment.
* @param str {String} A WKT fragment representing the point
* @memberof Wkt.Wkt.ingest
* @instance
*/
point: function (str) {
var coords = Wkt.trim(str).split(this.regExes.spaces);
// In case a parenthetical group of coordinates is passed...
return [{ // ...Search for numeric substrings
x: parseFloat(this.regExes.numeric.exec(coords[0])[0]),
y: parseFloat(this.regExes.numeric.exec(coords[1])[0])
}];
},
/**
* Return a multipoint feature given a multipoint WKT fragment.
* @param str {String} A WKT fragment representing the multipoint
* @memberof Wkt.Wkt.ingest
* @instance
*/
multipoint: function (str) {
var i, components, points;
components = [];
points = Wkt.trim(str).split(this.regExes.comma);
for (i = 0; i < points.length; i += 1) {
components.push(this.ingest.point.apply(this, [points[i]]));
}
return components;
},
/**
* Return a linestring feature given a linestring WKT fragment.
* @param str {String} A WKT fragment representing the linestring
* @memberof Wkt.Wkt.ingest
* @instance
*/
linestring: function (str) {
var i, multipoints, components;
// In our x-and-y representation of components, parsing
// multipoints is the same as parsing linestrings
multipoints = this.ingest.multipoint.apply(this, [str]);
// However, the points need to be joined
components = [];
for (i = 0; i < multipoints.length; i += 1) {
components = components.concat(multipoints[i]);
}
return components;
},
/**
* Return a multilinestring feature given a multilinestring WKT fragment.
* @param str {String} A WKT fragment representing the multilinestring
* @memberof Wkt.Wkt.ingest
* @instance
*/
multilinestring: function (str) {
var i, components, line, lines;
components = [];
lines = Wkt.trim(str).split(this.regExes.doubleParenComma);
if (lines.length === 1) { // If that didn't work...
lines = Wkt.trim(str).split(this.regExes.parenComma);
}
for (i = 0; i < lines.length; i += 1) {
line = lines[i].replace(this.regExes.trimParens, '$1');
components.push(this.ingest.linestring.apply(this, [line]));
}
return components;
},
/**
* Return a polygon feature given a polygon WKT fragment.
* @param str {String} A WKT fragment representing the polygon
* @memberof Wkt.Wkt.ingest
* @instance
*/
polygon: function (str) {
var i, j, components, subcomponents, ring, rings;
rings = Wkt.trim(str).split(this.regExes.parenComma);
components = []; // Holds one or more rings
for (i = 0; i < rings.length; i += 1) {
ring = rings[i].replace(this.regExes.trimParens, '$1').split(this.regExes.comma);
subcomponents = []; // Holds the outer ring and any inner rings (holes)
for (j = 0; j < ring.length; j += 1) {
// Split on the empty space or '+' character (between coordinates)
subcomponents.push({
x: parseFloat(ring[j].split(this.regExes.spaces)[0]),
y: parseFloat(ring[j].split(this.regExes.spaces)[1])
});
}
components.push(subcomponents);
}
return components;
},
/**
* Return a multipolygon feature given a multipolygon WKT fragment.
* @param str {String} A WKT fragment representing the multipolygon
* @memberof Wkt.Wkt.ingest
* @instance
*/
multipolygon: function (str) {
var i, components, polygon, polygons;
components = [];
polygons = Wkt.trim(str).split(this.regExes.doubleParenComma);
for (i = 0; i < polygons.length; i += 1) {
polygon = polygons[i].replace(this.regExes.trimParens, '$1');
components.push(this.ingest.polygon.apply(this, [polygon]));
}
return components;
},
/**
* Return an array of features given a geometrycollection WKT fragment.
* @param str {String} A WKT fragment representing the geometry collection
* @memberof Wkt.Wkt.ingest
* @instance
*/
geometrycollection: function (str) {
console.log('The geometrycollection WKT type is not yet supported.');
}
}; // eo ingest
/**
* @augments Wkt.Wkt
* Truncates an Array of coordinates by the closing coordinate when it is
* equal to the first coordinate given--this is only to be used for closed
* geometries in order to provide merely an "implied" closure to Leaflet.
* @param coords {Array} An Array of x,y coordinates (objects)
* @return {Array}
*/
Wkt.Wkt.prototype.trunc = function (coords) {
var i, verts = [];
for (i = 0; i < coords.length; i += 1) {
if (Wkt.isArray(coords[i])) {
verts.push(this.trunc(coords[i]));
} else {
// Add the first coord, but skip the last if it is identical
if (i === 0 || !this.sameCoords(coords[0], coords[i])) {
verts.push(coords[i]);
}
}
}
return verts;
};
/**
* @augments Wkt.Wkt
* An object of framework-dependent construction methods used to generate
* objects belonging to the various geometry classes of the framework.
*/
Wkt.Wkt.prototype.construct = {
/**
* Creates the framework's equivalent point geometry object.
* @param config {Object} An optional properties hash the object should use
* @param component {Object} An optional component to build from
* @return {L.marker}
*/
point: function (config, component) {
var coord = component || this.components;
if (coord instanceof Array) {
coord = coord[0];
}
return L.marker(this.coordsToLatLng(coord), config);
},
/**
* Creates the framework's equivalent multipoint geometry object.
* @param config {Object} An optional properties hash the object should use
* @return {L.featureGroup}
*/
multipoint: function (config) {
var i,
layers = [],
coords = this.components;
for (i = 0; i < coords.length; i += 1) {
layers.push(this.construct.point.call(this, config, coords[i]));
}
return L.featureGroup(layers, config);
},
/**
* Creates the framework's equivalent linestring geometry object.
* @param config {Object} An optional properties hash the object should use
* @param component {Object} An optional component to build from
* @return {L.polyline}
*/
linestring: function (config, component) {
var coords = component || this.components,
latlngs = this.coordsToLatLngs(coords);
return L.polyline(latlngs, config);
},
/**
* Creates the framework's equivalent multilinestring geometry object.
* @param config {Object} An optional properties hash the object should use
* @return {L.multiPolyline}
*/
multilinestring: function (config) {
var coords = this.components,
latlngs = this.coordsToLatLngs(coords, 1);
return L.multiPolyline(latlngs, config);
},
/**
* Creates the framework's equivalent polygon geometry object.
* @param config {Object} An optional properties hash the object should use
* @return {L.multiPolygon}
*/
polygon: function (config) {
// Truncate the coordinates to remove the closing coordinate
var coords = this.trunc(this.components),
latlngs = this.coordsToLatLngs(coords, 1);
return L.polygon(latlngs, config);
},
/**
* Creates the framework's equivalent multipolygon geometry object.
* @param config {Object} An optional properties hash the object should use
* @return {L.multiPolygon}
*/
multipolygon: function (config) {
// Truncate the coordinates to remove the closing coordinate
var coords = this.trunc(this.components),
latlngs = this.coordsToLatLngs(coords, 2);
return L.multiPolygon(latlngs, config);
},
/**
* Creates the framework's equivalent collection of geometry objects.
* @param config {Object} An optional properties hash the object should use
* @return {L.featureGroup}
*/
geometrycollection: function (config) {
var comps, i, layers;
comps = this.trunc(this.components);
layers = [];
for (i = 0; i < this.components.length; i += 1) {
layers.push(this.construct[comps[i].type].call(this, comps[i]));
}
return L.featureGroup(layers, config);
}
};
L.Util.extend(Wkt.Wkt.prototype, {
coordsToLatLngs: L.GeoJSON.coordsToLatLngs,
// TODO Why doesn't the coordsToLatLng function in L.GeoJSON already suffice?
coordsToLatLng: function (coords, reverse) {
var lat = reverse ? coords.x : coords.y,
lng = reverse ? coords.y : coords.x;
return L.latLng(lat, lng, true);
}
});

38
gui-src/locales/ar.json vendored Normal file
View File

@@ -0,0 +1,38 @@
{
"select_location": "اختيار موقع",
"zoom_in_and_choose": "قم بالتكبير واختر منطقتك باستخدام أداة المستطيل",
"select_world": "تحديد عالم",
"choose_world": "اختيار عالم",
"no_world_selected": "لم يتم تحديد عالم",
"start_generation": "بدء البناء",
"progress": "التقدم",
"custom_selection_confirmed": "تم تأكيد التحديد المخصص!",
"error_coordinates_out_of_range": "خطأ: الإحداثيات خارج النطاق أو مرتبة بشكل غير صحيح (مطلوب خط العرض قبل خط الطول).",
"invalid_format": "تنسيق غير صالح. استخدم 'lat,lng,lat,lng' أو 'lat lng lat lng'.",
"generation_process_started": "بدأت عملية البناء.",
"winter_mode": "وضع الشتاء:",
"world_scale": "مقياس العالم:",
"custom_bounding_box": "مربع الحدود المخصص:",
"floodfill_timeout": "مهلة ملء الفيضان (ثواني):",
"ground_level": "مستوى الأرض:",
"choose_world_modal_title": "اختيار عالم",
"select_existing_world": "اختيار عالم موجود مسبقًا",
"generate_new_world": "إنشاء عالم جديد",
"customization_settings": "إعدادات التخصيص",
"footer_text": "© {year} Arnis v{version} من louis-e",
"new_version_available": "هناك نسخة جديدة متاحة! انقر هنا لتنزيلها.",
"minecraft_directory_not_found": "لم يتم العثور على مجلد ماين كرافت",
"world_in_use": "العالم المحدد قيد الاستخدام حاليًا",
"failed_to_create_world": "حدث خطأ عند محاولة إنشاء عالم جديد",
"no_world_selected_error": "لم يتم تحديد عالم",
"select_minecraft_world_first": "يرجى تحديد عالم ماين كرافت أولاً!",
"select_location_first": "يرجى اختيار موقع أولاً!",
"area_too_large": "تُعتبر هذه المنطقة كبيرة جدًا وقد تتجاوز حدود الحوسبة النموذجية.",
"area_extensive": "المنطقة واسعة جدًا وقد تتطلب الكثير من الوقت والموارد.",
"selection_confirmed": "تم تأكيد التحديد!",
"unknown_error": "خطأ غير معروف",
"license_and_credits": "الرخصة والمساهمون",
"placeholder_bbox": "الصيغة: lat,lng,lat,lng",
"placeholder_floodfill": "ثوانٍ",
"placeholder_ground": "مستوى الأرض"
}

38
gui-src/locales/de.json vendored Normal file
View File

@@ -0,0 +1,38 @@
{
"select_location": "Standort auswählen",
"zoom_in_and_choose": "Zoome hinein und wähle dein Gebiet aus",
"select_world": "Welt auswählen",
"choose_world": "Welt wählen",
"no_world_selected": "Keine Welt ausgewählt",
"start_generation": "Generierung starten",
"progress": "Fortschritt",
"custom_selection_confirmed": "Benutzerdefinierte Auswahl bestätigt!",
"error_coordinates_out_of_range": "Fehler: Koordinaten sind außerhalb des Bereichs oder falsch geordnet (Lat vor Lng erforderlich).",
"invalid_format": "Ungültiges Format. Bitte verwende 'lat,lng,lat,lng' oder 'lat lng lat lng'.",
"generation_process_started": "Generierungsprozess gestartet.",
"winter_mode": "Wintermodus:",
"world_scale": "Weltmaßstab:",
"custom_bounding_box": "Benutzerdefinierte BBOX:",
"floodfill_timeout": "Floodfill-Timeout (Sek):",
"ground_level": "Bodenhöhe:",
"choose_world_modal_title": "Welt wählen",
"select_existing_world": "Vorhandene Welt auswählen",
"generate_new_world": "Neue Welt generieren",
"customization_settings": "Anpassungseinstellungen",
"footer_text": "© {year} Arnis v{version} von louis-e",
"new_version_available": "Eine neue Version ist verfügbar! Klicke hier, um sie herunterzuladen.",
"minecraft_directory_not_found": "Minecraft Verzeichnis nicht gefunden",
"world_in_use": "Die ausgewählte Welt ist gerade in Benutzung",
"failed_to_create_world": "Neue Welt konnte nicht erstellt werden",
"no_world_selected_error": "Keine Welt ausgewählt",
"select_minecraft_world_first": "Wähle zuerst eine Minecraft Welt aus!",
"select_location_first": "Wähle zuerst einen Standort aus!",
"area_too_large": "Dieses Gebiet ist sehr groß und könnte das Berechnungslimit überschreiten.",
"area_extensive": "Diese Gebietsgröße könnte längere Zeit für die Generierung benötigen.",
"selection_confirmed": "Auswahl bestätigt!",
"unknown_error": "Unknown error",
"license_and_credits": "License and Credits",
"placeholder_bbox": "Format: lat,lng,lat,lng",
"placeholder_floodfill": "Sekunden",
"placeholder_ground": "Bodenhöhe"
}

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