<p>The time_slider can be used to select a year, but won't render anything for that time frame <em>yet</em>. The code needs a review/reality check.</p>
<hr>
<h4>You can merge this Pull Request by running</h4>
<pre> git pull https://github.com/OpenHistoricalMap/ohm-website time_slider2</pre>
<p>Or view, comment on, or merge it at:</p>
<p> <a href='https://github.com/openstreetmap/openstreetmap-website/pull/774'>https://github.com/openstreetmap/openstreetmap-website/pull/774</a></p>
<h4>Commit Summary</h4>
<ul>
<li>Syncing the new OHM repo with old changes. Adding layers and fixing text.</li>
<li>Cherry pick jeff's ohm commit on top of latest osm master, with additional string changes and fixes</li>
<li>Change strings to openhistoricalmap, replace image used in rss feeds etc</li>
<li>merge to master</li>
<li>Dont display OSM & OSMF specific contributor terms. Put in simple placeholder text for the moment. fixes #13</li>
<li>Disable Bing imagery and Mapbox Satellite on iD editor - choosing open aerail as default. refs #13</li>
<li>remove old non working layers. Promote historical map tiles to first / default</li>
<li>change some id strings and id locale strings to say openhistoricalmap</li>
<li>bring back 2008 and 2009 layers to site</li>
<li>first commit of time_slider2 branch - WIP</li>
<li>add ts files to index.js</li>
<li>remove duplicative div with class of query_wraper</li>
<li>mod to console.logs for error checking</li>
<li>Allow for multiple sliders, fix slider code being executed twice</li>
<li>Merge branch 'time_slider2' of https://github.com/JaimeLynSchatz/ohm-website into time_slider2</li>
<li>another attempt at the timeslider hook</li>
<li>undo hairbrained scheme in early stage</li>
<li>small tweak to outer nubs and day/month data-step text boxes</li>
<li>ya attempt to capture start_year from data-step input</li>
<li>another attempt to capture start_year from data-step input</li>
<li>take 12 with link_to for Time Search</li>
<li>syntax error fix?</li>
<li>another error: unexpected tIDENTIFIER, expecting ')'</li>
<li>fails on second tag</li>
<li>no errors but still not correct</li>
<li>back to ground zero</li>
<li>cosmetic change</li>
<li>possibly on right track with nested form</li>
<li>attempt at workaround to force form button to submit even for same location</li>
<li>workaround failed - hangs on search</li>
<li>old fashioned debugging with alerts</li>
<li>coding edison-style, I know what won't work</li>
<li>strip out old console.log statements</li>
<li>wild idea to make time search button work when clicked</li>
<li>typo fix and put id in span</li>
<li># goes in the quotations</li>
<li>using deprecated syntax for .click(function)</li>
<li>further syntax fix</li>
<li>try first-child to select the button</li>
<li>the :selected selector seemed like a good idea at the time</li>
<li>:select didn't work</li>
<li>mimicking the current .search_form behavior for .time_search</li>
<li>data-step = year</li>
<li>nested forms == no</li>
<li>need controller method here</li>
<li>the query is returning nil here</li>
<li>tracking returning nil error</li>
<li>getting query value but crashes in geocoder query type if/elsif block</li>
<li>baby steps to the query delivering the start_year data</li>
<li>what's under the hood in index.js when we call this.search</li>
<li>yes, JS, puts is an unexpected identifier</li>
<li>mimicking the router call for locational search - not DRY</li>
<li>taking a step back and looking under the hood of the router call for time_search</li>
<li>two steps forward with router call</li>
<li>pull out code that broke the location search</li>
<li>move year match regex **below** zip/postal codes</li>
<li>hack to force interpretation as year and not postal code</li>
<li>modify regex for years to accomodate ce/bce, etc</li>
<li>add action for search_start_year</li>
<li>add search_start_year to routes.rb</li>
<li>shot in the dark to produce something when querying start_year</li>
<li>failed attempt at having something to render for search_start_year</li>
<li>changed results syntax to no avail</li>
<li>breadcrumbs</li>
<li>capture query from params[];</li>
<li>trying to redirect start_year_search to google.com</li>
<li>need to use the search portion of the url</li>
<li>comment out code - last resort to see why full url is still running</li>
<li>found a workaround for the route 500 server error</li>
<li>first attempt at wikidata api</li>
<li>another attempt at using api written in php</li>
<li>small change, left off assignment</li>
<li>revert to modded error message to show query being used, new way only uses Nominatum</li>
<li>one big toe into rendering?</li>
</ul>
<h4>File Changes</h4>
<ul>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/774/files#diff-0">app/assets/images/favicon.ico</a>
(0)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/774/files#diff-1">app/assets/images/mag_map-rss2.0.png</a>
(0)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/774/files#diff-2">app/assets/images/osm_logo.png</a>
(0)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/774/files#diff-3">app/assets/javascripts/embed.js.erb</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/774/files#diff-4">app/assets/javascripts/index.js</a>
(13)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/774/files#diff-5">app/assets/javascripts/leaflet.map.js.erb</a>
(42)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/774/files#diff-6">app/assets/javascripts/osm.js.erb</a>
(3)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/774/files#diff-7">app/assets/javascripts/ts_main.js</a>
(69)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/774/files#diff-8">app/assets/javascripts/ts_slider.js</a>
(207)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/774/files#diff-9">app/assets/stylesheets/common.css.scss</a>
(43)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/774/files#diff-10">app/assets/stylesheets/parameters.scss</a>
(3)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/774/files#diff-11">app/assets/stylesheets/time_slider.css</a>
(42)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/774/files#diff-12">app/controllers/geocoder_controller.rb</a>
(23)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/774/files#diff-13">app/views/api/permissions.builder</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/774/files#diff-14">app/views/diary_entry/rss.rss.builder</a>
(4)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/774/files#diff-15">app/views/export/embed.html.erb</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/774/files#diff-16">app/views/layouts/_head.html.erb</a>
(4)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/774/files#diff-17">app/views/layouts/_header.html.erb</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/774/files#diff-18">app/views/layouts/_search.html.erb</a>
(13)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/774/files#diff-19">app/views/site/about.html.erb</a>
(6)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/774/files#diff-20">app/views/user/terms.html.erb</a>
(6)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/774/files#diff-21">config/example.application.yml</a>
(12)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/774/files#diff-22">config/locales/en.yml</a>
(88)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/774/files#diff-23">config/routes.rb</a>
(1)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/774/files#diff-24">db/structure.sql</a>
(31)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/774/files#diff-25">vendor/assets/iD/iD.js</a>
(73)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/774/files#diff-26">vendor/assets/iD/iD/locales/en.json</a>
(18)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/774/files#diff-27">vendor/assets/leaflet/leaflet.osm.js</a>
(21)
</li>
</ul>
<h4>Patch Links:</h4>
<ul>
<li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/774.patch'>https://github.com/openstreetmap/openstreetmap-website/pull/774.patch</a></li>
<li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/774.diff'>https://github.com/openstreetmap/openstreetmap-website/pull/774.diff</a></li>
</ul>
<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br>Reply to this email directly or <a href="https://github.com/openstreetmap/openstreetmap-website/pull/774">view it on GitHub</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/1419053__eyJzY29wZSI6Ik5ld3NpZXM6QmVhY29uIiwiZXhwaXJlcyI6MTcyMDE1OTc1NCwiZGF0YSI6eyJpZCI6MzYyODg0OTl9fQ==--0b923594a5835cf107e42195eff0770b61d028ae.gif" width="1" /></p>