1
0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-12-12 19:20:27 +00:00
TiddlyWiki5/editions/geospatialdemo/tiddlers/ui/geomarker.tid

128 lines
3.7 KiB
Plaintext
Raw Normal View History

Add Geospatial plugin (#7406) * Add XLSX import spec for demo real estate spreadsheets * Fix fieldname * Improve map pin * RealEstate demo: Set lat, long, price fields to be numeric * Clean up Flickr demo * Update geomap widget to refresh properly * Add Leaflet MasterCluster plugin * Setup the marker cluster plugin * Rearrange real estate demo * Reduce default cluster radius * Beginnings of real estate demo * Fix interpretation of HTTP status codes * Real estate demo: Make columns hideable * Real estate demo: sortability * Real estate demo: search and limit * Fix typo * Fix lat long transposition * Fix startup ordering * Add geolookup operator * Real Estate Demo: Add support for computed columns * Real estate demo: Increase result limit * Remove demo data * Track map pan and zoom state in a state tiddler * WIP * Use geojson extension for geojson file * Use geojson extensions for another geojson file * Split demo from the geospatial plugin into its own edition * Add build targets required by ./bin/site-build.sh... ... when building the geospatial edition as the main edition, making it easier to find on Vercel * CI Fixes * Fix default tab * Rearranging geospatial plugin vs. edition * More refactoring between demo and plugin * Start of plugin docs * Display GeoJSON properties on click * Fix layer lookup demo * Restore XLSX Utils plugin and dependencies * Cleanup docs * Remove 5.2.8 release note * Remove 5.2.8 release note * Docs update * Fix minor refreshing bug for geomap widget * Docs updates * Add jsonset operator * Add geonearestpoint operator * jsonset: support for other data types and documentation * Add logo * Add link to preview build * jsonset: add support for assigning JSON strings * Fix nonstandard initialisation code for fill/parameter/slot widgets * Introduce testcase widget so that we can reuse testcases as documentation examples There's still a bit to do: adding tabs to the source panel of the testcase display, and tweaking the CSS. * Update logo * Testcasewidget: Add tabs for switching between source tiddlers * Testcase appearance tweaks * Switch to fluid-fixed layout * Docs for the testcase-transclude and testcase-view widgets * Split docs into separate tabs * Extend testcase-view to be able to view other fields * Extend default testcase template to show all fields of payload tiddlers * Add some geomap examples * Fix testcase rounded corners * Add a geomap layer demo * Add favicon * Switch from building the geospatial plugin as the main build back to tw5.com To make it easier to get to the documentation for the new features * Remove obsolete comment * Remove geospatial plugin from tw5.com build * Fix build link * Add note about core enhancements included in this branch * Refactor data widget implementation To avoid code duplication * Integrate test cases with the docs * Remove erroneously pasted docs material * Remove erroneously copied olc-encode tests within old-decode test case * Refactor compound tiddler handling into data widget And add some tests for the data widget * Default test case template tweaks * Move Flickr macros into geospatial plugin from the demo edition * FlickrDemo: Simplify UI * FlickrMacros: Use a template to define photo tiddler fields * Remove geospatial plugin from prerelease default tiddlers * Extend Flickr helpers to support photoTiddlerTemplate parameter * Update modification times of doc tiddlers So that they are at the top of the recent tab * Update 5.3.0 release note * Remove custom CI step for this branch * Restore standard sitetitle * Flickr macro docs * Rename $:/tags/GeoLayer to $:/tags/GeoFeature And make sure that it works with all GeoJSON features, not just polygons * More test data (from leaflet.js) * Captions should be transcluded, not viewed raw * Make HTTP handler use wiki of widget that sent the message * Switch testcase widget to use an intrinsic template Makes things much simpler * Complete Flickr demos * Extend geonearestpoint operator to work with feature collections * Extend realestate demo to show data on nearest volcano * Flickr macros: fix pagination after first page Make sure that the widget we create to run the actions also has access to the event handlers attached to the rootwidget. * Real estate demo: Fix nearest volcano * Testcase docs update * Testcase template: put title at the top and remove header row * Docs correction * New geonearestpoint test case * Make test cases editable * Test case default template: Always put "Output" tab first * Initial Commit * HttpClient object shouldn't need to know about events * Add support for cancelling HTTP requests * Make the number of outstanding HTTP requests available in a state tiddler * Add a network activity button Click it to cancel outstanding requests * WIP * Fix typo Thanks @btheado Co-authored-by: btheado <brian.theado@gmail.com> * Data widget: parse carriage returns in compound tiddlers * Fix crash when cancelling more than one HTTP request Thanks @saqimtiaz * Further fixes to cancelling outstanding HTTP requests * Don't have data widget rendering its own JSON Making the data widget render its raw JSON (introduced in 683ec3300490714da21ef0a1e1e50d348473d868) was a bad idea as it messes up the innerwiki use of the data widget. Instead we use the testcase widget with a special template to render the raw JSON of the payload of a testcase, thus giving us a way to test the data widget * Fix missed docs update * Introduce geolayer widget for specifying layers for geomap * Fix breaking tests * Remove docs references to obsolete widgets * Tests for geounion, geointersect and geodifference * Support for multiple base layers * Make the layers control visible which allows the base layer to be chosen, and individual overlay layers to be hidden * Add tiddlers tagged $:/tags/GeoBaseLayer to define some useful map base layers * Add geobaselayer widget to define base layers * Add a satellite base layer and another terrain base layer * Add a note where to get more base layers * Docs update * Geomap widget: fix default base layer rendering * Add startPosition and layersPanel attributes to geomap widget * Update geolayer widget docs with missing attributes * Add interactive demos for geounion, geodifference, geointersection * Open geofeature and geomarker maps on the bounds of their content * Move settings from demo into plugin Because now the Flickr macros are part of the plugin * Icon for geospatial plugin * Fix missing body * Flickr Demo typo * Docs update * Add support for draggable markers * Removed accidentally committed file * Remove unwanted log * Add support for tm-request-geolocation message * Fix typo * Fix bug when fitting to non-extistent bounds * Update main wiki greeting * Use "Flickr helpers" instead of "Flickr macros" * File renames for 05d32716037dd14b8a3741b28a82235defea4701 * Fix testcase widget example Thanks @btheado * Fix testcase widget refreshing * Fix failing tests from 03b6413c7a519429ea75353faf32c0a0baf2b88e * Docs: Clarify that template must be in the payload * Testcase widget: Exclude tab state tiddlers See https://github.com/Jermolene/TiddlyWiki5/pull/7406#discussion_r1327971965 Thanks @btheado * Remove obsolete setquerystring operator Instead we have the query- parameters to the http request message * Remove obsolete change to --setfield command * Fix tiddler name typo * Initial Commit * Add note to preview build * Fix whitespace and indenting Thanks @pmario * Fix crash with unset $tiddler attribute on <$data> widget Thanks @CodaCodr * Remove Stamen baselayers They have stopped making them available for free - see https://maps.stamen.com/stadia-partnership/ * Disable test that won't run in browser CI * Disable broken tests * Update olc-encode.tid (#7885) Correct spelling * Don't duplicate "description" field in test cases * Use different background colours for nested testcase widgets * Extend the testcase widget to run tests * Add testcases to control panel * Add a view template body template to render testcase tiddlers * Test edition should display testcases * Whitespace fixes * Make testcase tiddler tempalte link to itself * Styling tweaks * Docs improvements * Styling tweaks * Run the new tw5.com testcases in the test edition * Update data widget to display its content in JSON * Add testcase convenience procedure * Clearer testcases for data widget, and docs tweaks * Don't expect our intentionally failing test to pass * Extend testcase default template so that the display format can be chosen It is selected by setting the variable "displayFormat" * DataWidget docs typo * Mark Geospatial plugin as experimental * Update to Leaflet v1.9.4 * Remove unneeded template Left over from when the testcase widget was first implemented * Don't hide the volcanoes of the world data set * Update Flickr demo docs * Fix subtle typo that was preventing popups from working correctly * Go back to hiding the volcanoes of the world by default Too much data for a small device now that the markers are displayed correctly * Clarify docs for tm-request-location * Update modified testcase from master * Prepare for merging --------- Co-authored-by: btheado <brian.theado@gmail.com> Co-authored-by: Drevarr <drevarr@gmail.com>
2024-05-31 12:31:30 +00:00
title: ui/geomarker
\define default-traveltime-time() 5400
\define completion-actions()
<$action-log/>
<$action-setfield $tiddler="$:/temp/_StatusCode" text=<<status>>/>
<$action-setfield $tiddler="$:/temp/_StatusText" text=<<statusText>>/>
<$action-setfield $tiddler="$:/temp/_Error" text=<<error>>/>
<$action-setfield $tiddler="$:/temp/_Result" text=<<data>>/>
<$action-setfield $tiddler="$:/temp/_Headers" text=<<headers>>/>
<$list filter="[<status>compare:number:gteq[200]compare:number:lteq[299]]" variable="ignore">
<$action-createtiddler $basetitle="$:/temp/_IsochroneLayer" text={{{ [<data>] }}} tags="$:/tags/GeoFeature" caption={{{ [<currentTiddler>get[caption]else<currentTiddler>addprefix[Travel time from ]] }}}/>
</$list>
\end
\define progress-actions()
<$action-log message="In progress-actions"/>
<$action-log/>
\end
\define payload-source()
\rules only transcludeinline transcludeblock filteredtranscludeinline filteredtranscludeblock
{
"departure_searches": [
{
"id": "My first isochrone",
"coords": {
"lat": {{!!lat}},
"lng": {{!!long}}
},
"departure_time": "2023-02-27T08:00:00Z",
"travel_time": {{{ [[$:/config/plugins/geospatial/traveltime/time]get[text]else<default-traveltime-time>] }}},
"transportation": {
"type": "driving"
}
}
]
}
\end
\define get-traveltime-actions()
<$wikify name="payload" text=<<payload-source>>>
<$action-log $message="Making payload"/>
<$action-log/>
<$action-sendmessage
$message="tm-http-request"
url="https://api.traveltimeapp.com/v4/time-map"
method="POST"
header-accept="application/geo+json"
header-Content-Type="application/json"
password-header-X-Api-Key="traveltime-secret-key"
password-header-X-Application-Id="traveltime-application-id"
body=<<payload>>
var-currentTiddler=<<currentTiddler>>
bind-status="$:/temp/plugins/tiddlywiki/geospatial/demo/traveltime/status"
bind-progress="$:/temp/plugins/tiddlywiki/geospatial/demo/traveltime/progress"
oncompletion=<<completion-actions>>
onprogress=<<progress-actions>>
/>
</$wikify>
\end
!! Mapped
<$geomap
state=<<qualify "$:/state/demo-map">>
startPosition="bounds"
>
<$geolayer lat={{!!lat}} long={{!!long}} alt={{!!alt}} color={{!!color}}/>
</$geomap>
!! Distance to other markers
<$let
thisLocation={{{ [geopoint{!!long},{!!lat}] }}}
>
<ul>
<$list filter="[all[shadows+tiddlers]tag[$:/tags/GeoMarker]sort[caption]] -[<currentTiddler>]">
<li>
<$link><$view field="caption"><$view field="title"/></$view></$link>
--
<$let
otherLocation={{{ [geopoint{!!long},{!!lat}] }}}
>
<$text text={{{ [geodistance<thisLocation>,<otherLocation>,[miles]fixed[0]] }}}/> miles
</$let>
</li>
</$list>
</ul>
</$let>
!! GeoFeature Lookups
<$let
thisLocation={{{ [geopoint{!!long},{!!lat}] }}}
>
<ul>
<$list filter="[all[shadows+tiddlers]tag[$:/tags/GeoFeature]sort[caption]]">
<li>
<$text text={{{ [<currentTiddler>get[caption]] :else[<currentTiddler>] }}}/> --
<$text text={{{ [<thisLocation>geolookup{!!text}] }}}/>
</li>
</$list>
</ul>
</$let>
!! Travel Time
<$button actions=<<get-traveltime-actions>>>
Call ~TravelTime
</$button>
Maximum time: <$edit-text tiddler="$:/config/plugins/geospatial/traveltime/time" default=<<default-traveltime-time>> tag="input"/> seconds
|Status |<$text text={{$:/temp/plugins/tiddlywiki/geospatial/demo/traveltime/status}}/> |
|Progress |<$text text={{$:/temp/plugins/tiddlywiki/geospatial/demo/traveltime/progress}}/> |
|Status Code |<$text text={{$:/temp/_StatusCode}}/> |
|Status Text |<$text text={{$:/temp/_StatusText}}/> |
|Error |<$text text={{$:/temp/_Error}}/> |
<$list filter="[<currentTiddler>has[photo-url]]" variable="ignore">
!! Photo
<img src={{!!photo-url}}/>
</$list>