{"shas":[["bfb17d1cb6eedb75f1467234ed56bfb1fe2651fb","c802371fec41ccedf152155687d17b735d639a49@cs.nott.ac.uk","More tweaks and bug fixes.","Kevin Glover"],["192c96c5a51c0cd8aca654b8e801562535e550e7","c802371fec41ccedf152155687d17b735d639a49@cs.nott.ac.uk","Merge remote branch 'origin/master'","Kevin Glover"],["9cd405a06d1ec330f3b9f955b81ab98b3f67e8c9","1c8c08db85a36cc69d975124539be839dea91342@tropic.org.uk","Fixes to tiler.","Stuart Reeves"],["5ff7168087f480205a733df029c2a75cee06a45a","1c8c08db85a36cc69d975124539be839dea91342@tropic.org.uk","Fixed tiling bug.","Stuart Reeves"],["78c9e01f3263cb5c454d8a30af63d2a563c6135c","c802371fec41ccedf152155687d17b735d639a49@cs.nott.ac.uk","OS Maps and other tweaks","Kevin Glover"],["629b5d518b3ea0cdc5135421ebc6e5c8bea9cda4","c802371fec41ccedf152155687d17b735d639a49@cs.nott.ac.uk","Merge remote branch 'origin/master'","Kevin Glover"],["91fbddeb8e3c49b2a4e388c38c322336c26c5913","c3ecbf70b781d07f8df5b51eb89dd5ea8e94dd6d@cs.nott.ac.uk","Added interface IUpdateableExternal to keep Everytrail implemtation away from Placebooks code...","Mark Paxton"],["afa9da42c6accbde76cac8e4ddab94538f07f2ec","c3ecbf70b781d07f8df5b51eb89dd5ea8e94dd6d@cs.nott.ac.uk","Merge branch 'master' of github.com:horizon-institute/Bridging-the-Rural-Divide--Placebooks\n\n* 'master' of github.com:horizon-institute/Bridging-the-Rural-Divide--Placebooks:\n  OS Maps and other tweaks\n  Fixed tiling bug.\n  Fixes to tiler.\n\nConflicts:\n\tplacebooks-webapp/src/placebooks/client/model/PlaceBookItem.java\n\tplacebooks-webapp/src/placebooks/client/model/Shelf.java\n\tplacebooks-webapp/src/placebooks/client/resources/PlaceBookCSS.java\n\tplacebooks-webapp/src/placebooks/client/resources/Resources.java\n\tplacebooks-webapp/src/placebooks/client/ui/LoginDialog.java\n\tplacebooks-webapp/src/placebooks/client/ui/PlaceBookCanvas.java\n\tplacebooks-webapp/src/placebooks/client/ui/PlaceBookEditor.java\n\tplacebooks-webapp/src/placebooks/client/ui/PlaceBookHome.java\n\tplacebooks-webapp/src/placebooks/client/ui/PlaceBookInteractionHandler.java\n\tplacebooks-webapp/src/placebooks/client/ui/PlaceBookPanel.java\n\tplacebooks-webapp/src/placebooks/client/ui/PlaceBookPublish.java\n\tplacebooks-webapp/src/placebooks/client/ui/PlaceBookToolbar.java\n\tplacebooks-webapp/src/placebooks/client/ui/items/AudioItem.java\n\tplacebooks-webapp/src/placebooks/client/ui/items/ImageItem.java\n\tplacebooks-webapp/src/placebooks/client/ui/items/MapItem.java\n\tplacebooks-webapp/src/placebooks/client/ui/items/PlaceBookItemWidget.java\n\tplacebooks-webapp/src/placebooks/client/ui/items/frames/PlaceBookItemFrame.java\n\tplacebooks-webapp/src/placebooks/client/ui/items/frames/PlaceBookItemFrameFactory.java\n\tplacebooks-webapp/src/placebooks/client/ui/items/frames/PlaceBookItemPopupFrame.java\n\tplacebooks-webapp/src/placebooks/client/ui/openlayers/Bounds.java\n\tplacebooks-webapp/src/placebooks/client/ui/openlayers/LonLat.java\n\tplacebooks-webapp/src/placebooks/client/ui/openlayers/OSMap.java\n\tplacebooks-webapp/src/placebooks/client/ui/openlayers/Projection.java\n\tplacebooks-webapp/src/placebooks/client/ui/places/PlaceBookSearchPlace.java\n\tplacebooks-webapp/src/placebooks/controller/TileHelper.java\n\tplacebooks-webapp/src/placebooks/model/PlaceBook.java","Mark Paxton"],["ac00b59dbcad5583776d846f39961bfdc2ae6a42","c802371fec41ccedf152155687d17b735d639a49@cs.nott.ac.uk","Fix compile error","Kevin Glover"],["938e04f00326c14ff7e0112cb01e498368aa9b18","c802371fec41ccedf152155687d17b735d639a49@cs.nott.ac.uk","Stuff","Kevin Glover"],["6c27c06110ef4fedc58cbf88503930817ca86ba5","c802371fec41ccedf152155687d17b735d639a49@cs.nott.ac.uk","More bugfixes/improvements.","Kevin Glover"],["b32df1a137289161cf9ed7d63582507ce471fcdb","c802371fec41ccedf152155687d17b735d639a49@cs.nott.ac.uk","Fixed a handful of bugs","Kevin Glover"],["8ced0f8ec6a664091bf5d7da47a25aac8400e813","1c8c08db85a36cc69d975124539be839dea91342@tropic.org.uk","Tiler fix.","Stuart Reeves"],["bfe6809e30d76b471896f348a5ffc9bb0c5630b7","1c8c08db85a36cc69d975124539be839dea91342@tropic.org.uk","Merge remote-tracking branch 'upstream/master'","Stuart Reeves"],["0a5d5fb8c35bc8ab5e3c5643b5fdacc6b18a1648","1c8c08db85a36cc69d975124539be839dea91342@tropic.org.uk","Fix to earlier bad merge, resulting in revert to earlier code.","Stuart Reeves"],["c2acc4f9ade636cb0a745de271454811da6b7257","1c8c08db85a36cc69d975124539be839dea91342@tropic.org.uk","Fixed conversion to WGS84.","Stuart Reeves"],["fe79ae09397e27660d3ad455fa9c73df18bea275","1c8c08db85a36cc69d975124539be839dea91342@tropic.org.uk","Fixed incorrect configuration in placebooks.properties.","Stuart Reeves"],["33bc79e1b7d4c8c1f0dbcef078f1fff15bfcd90b","1c8c08db85a36cc69d975124539be839dea91342@tropic.org.uk","Now writes GPX to file.","Stuart Reeves"],["2c5b0427a03c4667a3518813b66dad261c4ca7bf","fc9a7696a6ebed08acf4fbef7d38e7202dc2e016@Mark-Daviess-MacBook-Pro.local","Map YAH marker working accurately. Map trails are now working (example is hard-coded for now..I will change this properly to dynamic in the next day when the dev server is updated)","Mark Davies"]],"ref":"refs/heads/master","size":19,"head":"2c5b0427a03c4667a3518813b66dad261c4ca7bf","push_id":37604906}