Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: qedus/osmpbf
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.0
Choose a base ref
...
head repository: qedus/osmpbf
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Jun 22, 2017

  1. Make OSM header accessible (#24).

    Added functionality to retrieve OSM header information from the PBF file.
    karsten42 authored and jongillham committed Jun 22, 2017
    Copy the full SHA
    b4b1bd9 View commit details

Commits on Jun 30, 2017

  1. Fix err shadowing.

    AlekSi committed Jun 30, 2017
    Copy the full SHA
    5555ad0 View commit details
  2. Fix staticcheck warning.

    The goroutine calls T.Fatal, which must be called
    in the same goroutine as the test.
    AlekSi committed Jun 30, 2017
    Copy the full SHA
    004f7b3 View commit details
  3. Reduce memory footprint with aligncheck.

    benchmark                       old bytes      new bytes      delta
    BenchmarkDecode-4               1961236896     1917573859     -2.23%
    BenchmarkDecodeConcurrent-4     1961236249     1917568172     -2.23%
    AlekSi committed Jun 30, 2017
    Copy the full SHA
    1a21e6c View commit details
  4. Simplify code with gosimple.

    AlekSi committed Jun 30, 2017
    Copy the full SHA
    6aa2981 View commit details
  5. Copy the full SHA
    0430974 View commit details
  6. Check errors.

    AlekSi committed Jun 30, 2017
    Copy the full SHA
    fa95f92 View commit details

Commits on Jul 1, 2017

  1. Merge pull request #26 from qedus/lint

    Fix a bunch of errors found with gometalinter.
    AlekSi authored Jul 1, 2017
    Copy the full SHA
    cf733d8 View commit details

Commits on Jan 18, 2018

  1. Add Go 1.9 to Travis CI

    AlekSi authored Jan 18, 2018
    Copy the full SHA
    b1e20da View commit details

Commits on Jan 19, 2018

  1. Copy the full SHA
    dc56d40 View commit details

Commits on Jan 25, 2018

  1. Drop testing with Go 1.5.

    AlekSi committed Jan 25, 2018
    Copy the full SHA
    abdc15e View commit details
  2. Merge pull request #27 from qedus/benchmarks

    Use benchstat instead of benchcmp.
    AlekSi authored Jan 25, 2018
    Copy the full SHA
    d68589a View commit details

Commits on Mar 22, 2018

  1. Test with Go 1.10.

    AlekSi authored and jongillham committed Mar 22, 2018
    Copy the full SHA
    e1e4854 View commit details

Commits on Mar 25, 2018

  1. added working test case for parseNodes

    clydedcruz authored and AlekSi committed Mar 25, 2018
    Copy the full SHA
    09bf761 View commit details
  2. updated the gist link in test file

    clydedcruz authored and AlekSi committed Mar 25, 2018
    Copy the full SHA
    9cda7d9 View commit details
  3. Minor refactoring.

    AlekSi committed Mar 25, 2018
    Copy the full SHA
    d03e78c View commit details
  4. Copy the full SHA
    52ee967 View commit details
  5. 1.10.x works now.

    AlekSi committed Mar 25, 2018
    Copy the full SHA
    6d4e33d View commit details

Commits on Mar 27, 2018

  1. Add changelog.

    AlekSi authored and jongillham committed Mar 27, 2018
    Copy the full SHA
    80daa6c View commit details

Commits on Mar 29, 2018

  1. Version 1.1.0.

    AlekSi committed Mar 29, 2018
    Copy the full SHA
    6339269 View commit details

Commits on Aug 22, 2018

  1. Copy the full SHA
    f940871 View commit details

Commits on May 10, 2021

  1. Update proto (#37)

    Co-authored-by: Lucas Haug <fuermhandy@gmail.com>
    AlekSi and haug-den-lucas authored May 10, 2021
    Copy the full SHA
    3fd1ec1 View commit details
  2. Bump shogo82148/actions-goveralls from v1.4.3 to v1.4.4

    Bumps [shogo82148/actions-goveralls](https://github.com/shogo82148/actions-goveralls) from v1.4.3 to v1.4.4.
    - [Release notes](https://github.com/shogo82148/actions-goveralls/releases)
    - [Commits](shogo82148/actions-goveralls@v1.4.3...d1ad3d6)
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and AlekSi committed May 10, 2021
    Copy the full SHA
    a30c1bd View commit details
  3. Prepare release

    AlekSi committed May 10, 2021
    Copy the full SHA
    a49202a View commit details

Commits on Feb 18, 2022

  1. Show throughput in benchmarks

    codesoap authored and AlekSi committed Feb 18, 2022
    Copy the full SHA
    9784fab View commit details

Commits on Mar 21, 2022

  1. Bump actions/checkout from 2 to 3

    Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
    - [Release notes](https://github.com/actions/checkout/releases)
    - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
    - [Commits](actions/checkout@v2...v3)
    
    ---
    updated-dependencies:
    - dependency-name: actions/checkout
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and jongillham committed Mar 21, 2022
    Copy the full SHA
    65c901c View commit details
  2. Bump shogo82148/actions-goveralls from 1.4.4 to 1.5.1

    Bumps [shogo82148/actions-goveralls](https://github.com/shogo82148/actions-goveralls) from 1.4.4 to 1.5.1.
    - [Release notes](https://github.com/shogo82148/actions-goveralls/releases)
    - [Commits](shogo82148/actions-goveralls@v1.4.4...v1.5.1)
    
    ---
    updated-dependencies:
    - dependency-name: shogo82148/actions-goveralls
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and jongillham committed Mar 21, 2022
    Copy the full SHA
    23bf604 View commit details
  3. Bump google.golang.org/protobuf from 1.26.0 to 1.27.1

    Bumps [google.golang.org/protobuf](https://github.com/protocolbuffers/protobuf-go) from 1.26.0 to 1.27.1.
    - [Release notes](https://github.com/protocolbuffers/protobuf-go/releases)
    - [Changelog](https://github.com/protocolbuffers/protobuf-go/blob/master/release.bash)
    - [Commits](protocolbuffers/protobuf-go@v1.26.0...v1.27.1)
    
    ---
    updated-dependencies:
    - dependency-name: google.golang.org/protobuf
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and jongillham committed Mar 21, 2022
    Copy the full SHA
    e137059 View commit details
Showing with 1,962 additions and 609 deletions.
  1. +11 −0 .github/dependabot.yml
  2. +63 −0 .github/workflows/go.yml
  3. +0 −22 .travis.yml
  4. +20 −0 CHANGELOG.md
  5. +6 −3 Makefile
  6. +9 −1 OSMPBF/Makefile
  7. +12 −4 OSMPBF/README.md
  8. +323 −64 OSMPBF/fileformat.pb.go
  9. +36 −23 OSMPBF/fileformat.proto
  10. +1,128 −314 OSMPBF/osmformat.pb.go
  11. +115 −113 OSMPBF/osmformat.proto
  12. +4 −3 README.md
  13. +85 −19 decode.go
  14. +1 −3 decode_data.go
  15. +136 −40 decode_test.go
  16. +5 −0 go.mod
  17. +8 −0 go.sum
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
version: 2
updates:
- package-ecosystem: "gomod"
directory: "/"
schedule:
interval: "monthly"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
63 changes: 63 additions & 0 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
---
name: Go

on:
push:
branches: [master]
pull_request:

jobs:
build:
name: Build

strategy:
fail-fast: false
matrix:
go: [1.16.x]
may-fail: [false]
include:
- go: tip
may-fail: true

runs-on: ubuntu-20.04
continue-on-error: ${{ matrix.may-fail }}

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Setup Go v${{ matrix.go }}
if: ${{ matrix.go != 'tip' }}
uses: actions/setup-go@v2
with:
go-version: ${{ matrix.go }}

- name: Setup Go tip
if: ${{ matrix.go == 'tip' }}
run: |
curl -OL https://github.com/AlekSi/golang-tip/releases/download/tip/master.linux-amd64.tar.gz
sudo rm -rf /usr/local/go
sudo tar -C /usr/local -xzf master.linux-amd64.tar.gz
sudo ln -vsf /usr/local/go/bin/* /usr/bin/
sudo ln -vsf /usr/local/go/bin/* /bin/
- name: Run debug commands
run: |
env
which -a go
go version
go env
- name: Install tools
run: make init

- name: Test with race detector
run: make race

- name: Gather test coverage
run: make cover

- name: Upload test coverage report to coveralls.io
uses: shogo82148/actions-goveralls@v1.5.1
with:
path-to-profile: profile.cov
22 changes: 0 additions & 22 deletions .travis.yml

This file was deleted.

20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Changelog

## v1.2.0 (tagged 2021-05-10)

* Converted to Go module.
* Updated .proto files ([#35](https://github.com/qedus/osmpbf/pull/35) by Lucas).
* Updated protobuf dependency.
* Migrated CI to GitHub Actions.

## v1.1.0 (tagged 2018-03-29)

* Added [`Decoder.Header()` method](https://pkg.go.dev/github.com/qedus/osmpbf#Decoder.Header)
([#24](https://github.com/qedus/osmpbf/pull/24) by Karsten Klompmaker).
* Added support for non-dense Nodes
([#30](https://github.com/qedus/osmpbf/pull/30) by Clyde D'Cruz).
* Minor optimizations.

## v1.0.0 (tagged 2017-03-15)

* First release with stable public API.
9 changes: 6 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -2,6 +2,9 @@ export GORACE := halt_on_error=1

all: cover

init:
go install -v golang.org/x/perf/cmd/benchstat@latest

race:
go install -v -race
go test -v -race
@@ -11,6 +14,6 @@ cover:
go test -v -coverprofile=profile.cov

bench:
env OSMPBF_BENCHMARK_BUFFER=1048576 go test -v -run=NONE -bench=. -benchmem -benchtime=10s | tee 01.txt
env OSMPBF_BENCHMARK_BUFFER=33554432 go test -v -run=NONE -bench=. -benchmem -benchtime=10s | tee 32.txt
benchcmp 01.txt 32.txt
env OSMPBF_BENCHMARK_BUFFER=1048576 go test -v -run=NONE -bench=. -benchmem -benchtime=10s -count=5 | tee 01.txt
env OSMPBF_BENCHMARK_BUFFER=33554432 go test -v -run=NONE -bench=. -benchmem -benchtime=10s -count=5 | tee 32.txt
benchstat 01.txt 32.txt
10 changes: 9 additions & 1 deletion OSMPBF/Makefile
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
all:
protoc --go_out=. *.proto
# sync version with ../go.mod
go install -v google.golang.org/protobuf/cmd/protoc-gen-go@v1.26.0

rm *.go
protoc --go_out=. \
--go_opt=paths=source_relative \
--go_opt=Mfileformat.proto=github.com/qedus/osmpbf/OSMPBF \
--go_opt=Mosmformat.proto=github.com/qedus/osmpbf/OSMPBF \
*.proto
16 changes: 12 additions & 4 deletions OSMPBF/README.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,27 @@
*.proto files were downloaded from https://github.com/scrosby/OSM-binary/tree/master/src and changed in following ways:
# Proto Files

* To eliminate continuous conversions from `[]byte` to `string`, this
`*.proto` files were downloaded from https://github.com/scrosby/OSM-binary/tree/master/src and changed in following ways:

## Changes

### StringTable

- **File**: `osmformat.proto`
- **Reason**: To eliminate continuous conversions from `[]byte` to `string`
- **Old code**:

```protobuf
message StringTable {
repeated bytes s = 1;
}
```

was changed to
- **New code**:

```protobuf
message StringTable {
repeated string s = 1;
}
```

This changes is expected to be fully compatible with all PBF files.
- **Comptatibility**: This change is expected to be fully compatible with all PBF files.
Loading