No description, website, or topics provided.
JavaScript Shell XSLT
Switch branches/tags
Nothing to show
Clone or download
Fetching latest commit…
Cannot retrieve the latest commit at this time.
Permalink
Failed to load latest commit information.
lib
LOCAL.md
README.md
TWO.md
apply-or-update.sh
apply-osc.js
changeset-bbox.js
decrement-versions.js
filter-by-use.js
gather_changesets.sh
generate-osc.js
git-resolve
handle-diffresult.js
initialize-repo.sh
osc-bbox.js
package.json
preprocess-changesets.sh
rebase-one.sh
remap-userid.sh
renumber.js
reset.sh
run.sh
submit-all.sh
submit.sh
upload-changeset.sh
whatever.xslt

README.md

Changeset Replay Tool

This tool collects changesets from an OSM API endpoint and replays them against a different endpoint, rewriting IDs as objects are created.

Steps

  1. Choose a known starting point and generate XML corresponding to it. (AOI to start, but it's really about the MBR of all of the edits)
  2. Add the XML to an empty git repository
  3. Collect changesets from a running API
  4. Write them into changesets/<#>.osc
  5. Use osmupdate or Osmosis to apply each of the OSC files to the original XML
  6. Stage the OSC
  7. Commit the changes to the XML w/ changeset tags in the commit message
  8. Voilà, commit history as a git repository

To replay:

  1. Run git rebase --exec <base revision>
  2. For each commit, submit the OSC (either present or generated from the diff between the current and previous XML representations) file to an OSM API using the changeset tags in the commit message
  3. Apply the resulting OSC (potentially with different IDs) to the previous XML representation.
  4. git commit --amend
  5. git rebase --continue - ?? - will it correctly update changed ids?

To replay:

  1. git checkout master
  2. For each commit in git cherry master | grep -v ^- <- problematic because timestamp, version, and changeset cause git patch-id to change
  3. git log --reverse --format=%h
  4. git checkout upstream
  5. git merge <commit> -s recursive -X theirs
  6. git cherry-pick -X theirs <commit> <- merge strategy may be wrong, use patience instead
  7. If it fails to resolve cleanly (check for .git/CHERRY_PICK_HEAD), git cherry-pick --abort and go to (1) (potentially branching and rebasing against the most recent successful commit, leaving (cherry-picking?) failed commits on a "failed" branch)
  8. foreach-commit.sh (this will attempt to upload the changeset and will apply notes and tag it with the changeset id)
  9. If it fails, git reset --hard @~1 to drop the commit and go to (1) <- this is probably where cherry-picking failed commits makes sense (as it wasn't a local patch application problem)
  10. Process the DiffResult and rebase --exec from <commit>..pending to rewrite IDs OR create a new commit and slip it in, hoping that subsequent ID usages will pick it up. Update the version as well. Ideally both will match, but they may not. Actually, applying the OSC fetched from OSM may effectively do this.
  11. TODO rewrite the pending commit's title so that it can be filtered out: `git commit --amend -m "uploaded as $(git show -s --format=%h pending)" ``
  12. TODO or squash uploaded commits in the pending tree
  13. Process the next commit

We can largely ignore the XML diffing problem (outlined here), since the data we're working with is always structured the same way. To help with diffs, we split out attributes per-line.

TODO query the API for each modified way to see if its current state (version) matches what's expected.

Rebase onto a different branch, execing each commit.

GIT_EDITOR=true git rebase -i -X ours --exec "/Users/seth/src/americanredcross/changeset-replay-tool/foreach-commit.sh" start

To get the commit message only: git log --format=%B -n 1 [commit] git show -s --format=%B [commit]

To make word diffs character: --word-diff-regex=.

Attach notes with the response and appropriate debugging information (calculated changeset, submitted changeset).

To test whether a patch will apply:

git show <commit> | git-apply --check -

Instead of rebasing, run through git log and attempt to apply each

git cherry-pick <commit>

Show changes left to apply:

[pending] git cherry uploaded
<osmChange version="0.6" generator="osmconvert 0.8.5"><create><way id="401684942" version="1" timestamp="2016-03-13T02:40:12Z" changeset="37765189"><nd ref="4054910999"></nd><nd ref="4054911000"></nd><nd ref="4054911001"></nd><nd ref="4054911002"></nd><nd ref="4054910999"></nd><tag k="leisure" v="park"></tag><tag k="name" v="Parky Park"></tag></way></create></osmChange>
===> Uploading to changeset 37765189
Error:
Precondition failed: Way  requires the nodes with id in (4054910999,4054911000,4054911001,4054911002), which either do not exist, or are not visible.

When testing:

  • Create some new nodes + ways in the target database (or update the sequence) to ensure that IDs need to be rewritten

Problematic Cases / Potential Conflicts

  • Changeset ID offset
  • Entity has been modified (has a different version number than expected) before being modified or deleted
  • Entity's refs have been deleted
  • Entity's refs were created locally (need to be re-numbered)

Identifying Independent Commits

  • Disconnected subgraphs

https://www.npmjs.com/package/dependency-graph -- Use entity IDs as dependencies (w:1234), checking whether they already exist (i.e. were modified during previous edits) before adding them.

Alternately, changesets depend on entities.

Inverted index of changesets by entity IDs. Use this to look up changeset order after determining entity ordering

Current Problems

  • Ensure that changeset IDs are rewritten and a clean set of changesets apply
  • Ensure that local "merge conflicts" don't occur
  • Rewrite entity IDs after creating new elements (increase the sequence value)
  • Raise conflicts/confirmations on nth (2+) node movements (OR prefer local changes with the assumption that they represent ground truthing)
  • Determine whether ^^ applies to ways (it would if we were using the OSCs, but since we're generating OSCs from the diff, the diff will have been updated with whatever tag + ref changes made during a previous resolution)

Future Problems

  • Pre-emptive conflict detection (by querying the API for entities referred to in a given changeset)
  • Working set size reduction (R-Tree filtering of input AOI)
  • Moving nodes locally + remotely. 1 remote move, 2+ local moves. First will raise a conflict, subsequent local moves won't.
    • Keep a sorted list (as a file or a prefixed tree, possibly containing some state) containing the IDs of entities that have been touched (and a separate one for conflicts and a separate one for conflicts resolved in favor of upstream edits). If a changeset touches anything in the conflicted list, mark it as conflicted.

    • nth edits are conflicts IF the previous version of the entity in question was resolved in favor of upstream. If it was resolved in favor of the local version, it's not a conflict.

    • Look at the previous state (lat/lng/nds/members/tags) of the node (via xpath against the full XML) and compare it to the upstream version. This will indicate how the conflict was resolved (but only for ours/theirs, not a merge).

Conflict resolution

  1. Update the version number of the entity that's conflicting (accept local)
  2. Drop the entity that's conflicting from the OSC (accept remote). ADD TO CONFLICT LIST as "remote"
  3. Update the version number AND body of the entity that's conflicting (merge). ADD TO CONFLICT LIST as "merged"

(Version numbers don't need to be updated because they will automatically increment because we're generating OSC from XML diffs.)

Other Approaches

Pull changesets for the matching bounding box and apply them to the upstream branch before starting. May need to paginate if more than 100 changesets appear.

This approach allows us to merge each commit on master against upstream (locally) to identify + resolve merge conflicts. Once that's been done, upstream can be "rebased" against the remote API, applying each commit (vs. submitting each commit at merge-time).

OR

Fetch the same extract from Overpass, which will have all of the changesets applied (and we don't care about the content of individual changesets)

echo "(node(-3.515306,-80.259418,-3.447453,-80.184231);<;>>;>;);out meta;" > huaquillas.overpass
wget -O huaquillas-201603301217.xml --post-file=huaquillas.overpass http://overpass-api.de/api/interpreter

xsltproc --stringparam pattern //changeset/@id --stringparam value . whatever.xslt remote_changesets.xml

fetch-remote-changesets.sh <bbox> apply-remote-changesets.sh <directory>

psql -d openstreetmap -c "CREATE EXTENSION btree_gist"
psql -d openstreetmap -c "CREATE FUNCTION maptile_for_point(int8, int8, int4) RETURNS int4 AS '/opt/osm/osm-web/db/functions/libpgosm', 'maptile_for_point' LANGUAGE C STRICT"
psql -d openstreetmap -c "CREATE FUNCTION tile_for_point(int4, int4) RETURNS int8 AS '/opt/osm/osm-web/db/functions/libpgosm', 'tile_for_point' LANGUAGE C STRICT"
psql -d openstreetmap -c "CREATE FUNCTION xid_to_int4(xid) RETURNS int4 AS '/opt/osm/osm-web/db/functions/libpgosm', 'xid_to_int4' LANGUAGE C STRICT"


osmosis --truncate-apidb database=openstreetmap validateSchemaVersion=no --rbf huaquillas-fixed.pbf --log-progress --write-apidb database=openstreetmap validateSchemaVersion=no
psql -d openstreetmap -c "select setval('changesets_id_seq', (select max(id) from changesets))"
psql -d openstreetmap -c "select setval('current_nodes_id_seq', (select max(node_id) from nodes))"
psql -d openstreetmap -c "select setval('current_ways_id_seq', (select max(way_id) from ways))"
psql -d openstreetmap -c "select setval('current_relations_id_seq', (select max(relation_id) from relations))"
psql -d openstreetmap -c "select setval('users_id_seq', (select max(id) from users))"
bundle exec rake osm:users:create display_name='POSM' description='Portable OpenStreetMap'

Optimizations

  • Determine the bounding box for all edits and restrict the original XML to that area
  • Generate an R-tree of edit bounding boxes and subdivide the files according to top-level bounding boxes - enable parallelism, reduce input size