Skip to content

Update vector data to April 2026#4357

Merged
holta merged 15 commits intoiiab:masterfrom
orblivion:update-vector-apr-2026
Apr 15, 2026
Merged

Update vector data to April 2026#4357
holta merged 15 commits intoiiab:masterfrom
orblivion:update-vector-apr-2026

Conversation

@orblivion
Copy link
Copy Markdown
Contributor

@orblivion orblivion commented Apr 14, 2026

Description of changes proposed in this pull request:

  • Update osm vector data to April 1 2026 (satellite, terrain, and even naturalearth vector doesn't seem to change)
  • Change zoom naming scheme from (for example) zoom_0-07 to z00-07
  • Change zoom naming scheme from full to (in the case of OSM) z00-z14. i.e. explicitly name the zoom levels.
  • Add osm-z11 option.

So now the way this works:

As we add a new vector file and update the vector_data_date, Ansible will download the new file and update the symlink that index.html looks for.

FQRs are managed via the file extracts.json which index.html reads to know which FQR files exist. This PR changes the format of extracts.json to include the date, which index.html now needs to find the file, because it can no longer assume the date based on vector_data_date. There's no telling how old the FQRs are. The FQR managing script now will add the dates to extracts.json when it updates it. It is also a bit more careful about deleting them, in case stray files with different dates are somehow sitting around.

Smoke-tested on which OS or OS's:

RasPi OS Trixie

Mention a team member @username e.g. to help with code review:

@holta

# Cities-only static database
# maps_search_static_db = "pop-1k-cities"
pop-1k-cities: "static-search.{{ maps_data_date }}.pop-1k-cities"
pop-1k-cities: "static-search.{{ maps_slow_data_date }}.pop-1k-cities"
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Per the above comments this was supposed to be the "slow" date anyway. But I'll change it to the new "search data date" when I update search.

Comment thread roles/maps/README.md

```
maps_vector_quality: osm-full
maps_vector_quality: osm-z14
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't want to update z9->z11 in the README until I we try downloading it and get the file size as reported locally.

def get_paths(base):
VECTOR_ZOOM_RANGE = "z00-z{{ '%02d' % maps_vector_max_zoom }}"
SATELLITE_ZOOM_RANGE = "z00-z{{ '%02d' % maps_satellite_max_zoom }}"
TERRAIN_ZOOM_RANGE = "z00-z{{ '%02d' % maps_terrain_max_zoom }}"
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know that we don't need zero-padding for any of the existing numbers but I want to future-proof it.

@holta holta added this to the 8.3 milestone Apr 14, 2026
@orblivion
Copy link
Copy Markdown
Contributor Author

https://github.com/orblivion/iiab/actions/runs/24413611959/job/71316798194

At the end of Build Image:

Ansible quit before photograph. Exiting with failure.
Error: Process completed with exit code 1.

Any idea @chapmanjacobd ? I don't see any obvious actual cause.

I looked for "error" above in the logs and found this, along with a few other thing that fail the same way. I'm guessing unrelated, since it didn't stop the installation right away:

TASK [yarn : debug] ************************************************************
Warning: : Encountered 1 template error.
error 1 - 'yarn_installed' is undefined
Origin: /opt/iiab/iiab/roles/yarn/tasks/main.yml:26:10

24     var: yarn_enabled
25 - debug:
26     var: yarn_installed
            ^ column 10

ok: [127.0.0.1] => {
    "yarn_installed": "<< error 1 - 'yarn_installed' is undefined >>"
}

@chapmanjacobd
Copy link
Copy Markdown
Member

chapmanjacobd commented Apr 14, 2026

Ah I think you'll need to merge main back into this branch? although the tests are passing now? ah yes it's only on your branch--

So you don't need to do anything really... the tests pass in here which test the changes in your branch applied on top of master. If you want the error in your branch to go away you can merge master back in

@holta holta marked this pull request as draft April 14, 2026 22:46
@holta
Copy link
Copy Markdown
Member

holta commented Apr 14, 2026

I converted this PR to draft, as @orblivion is reworking FQR (full quality region) aspects, which need to fit in with our new filename scheme!

@orblivion
Copy link
Copy Markdown
Contributor Author

I think that covers it. I did a fair amount of Python and JS now for the FQR stuff so @chapmanjacobd your review would be valuable.

@orblivion orblivion marked this pull request as ready for review April 15, 2026 15:00
@holta holta requested a review from chapmanjacobd April 15, 2026 15:04
# date designations down the line. I just want one "slow" date to set all of
# these items *for now*.
#
maps_data_date: "2025-12-10"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no lingering references to maps_data_date anywhere, right?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Double checked, nothing in the whole repo.

@chapmanjacobd
Copy link
Copy Markdown
Member

looks good

@orblivion
Copy link
Copy Markdown
Contributor Author

Some followups I can do:

  • For the extracts.json generator script, I give a warning if some region is incomplete, i.e. only osm and satellite but not terrain. I could add a similar warning if there are multiple dates for the same thing. And double check that it's using the latest one if so (though because of alphabetical ordering this might accidentally already be happening).

  • For osm zoom 11 I can test it out and then add it to the README.

@orblivion
Copy link
Copy Markdown
Contributor Author

Testing with a couple different quality levels for world map. Not very high quality for time sake. Though I did test adding FQRs. I also tested deleting FQRs. Anything else I should try before we merge?

@holta holta merged commit ec44b50 into iiab:master Apr 15, 2026
5 checks passed
@orblivion orblivion deleted the update-vector-apr-2026 branch April 15, 2026 16:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants