Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
233 commits
Select commit Hold shift + click to select a range
0009825
beginning to rewrite, only getting option values and building empty m…
Nov 15, 2020
3d52e3c
begin to implement main component
Nov 16, 2020
e204029
tile layers management ok, mapboxgl ok
Nov 16, 2020
322576a
routing almost ok
Nov 16, 2020
75eead1
add routers, allow changing, allow closing, export missing
Nov 16, 2020
6046bea
bring back layer selection style the way it was
Nov 17, 2020
dbb4290
add navigation with settings only
Nov 17, 2020
c3d44f8
fix layer button visibility
Nov 18, 2020
094cff4
beginning to implement contacts, only dummy navigation
Nov 18, 2020
cc2fcc6
contacts in progress
Nov 18, 2020
512cf92
contact marker and cluster icons OK
Nov 18, 2020
0dfbe29
contacts almost ok
Nov 19, 2020
d4b729c
remove contact group actions when disabled
Nov 19, 2020
b2a4eb4
fix tile layers names/ids
Nov 19, 2020
b7489d5
contact placement ok
Nov 20, 2020
bed7b3b
better map click management, dynamic icon for contact placement
Nov 20, 2020
a5e9640
add contact address deletion
Nov 20, 2020
3a4c026
popup/tooltip design
Nov 20, 2020
8ce7a51
fix placement popup position
Nov 20, 2020
4a28c55
fix contact group object generation
Nov 20, 2020
9b44266
handle click on cluster
Nov 21, 2020
e2d60d3
beginning photos, display markers and clusters ok
Nov 21, 2020
90eef0f
update composer libs
Nov 21, 2020
46591d3
photo tooltip ok
Nov 21, 2020
5f299d8
begin to implement new photo popup
Nov 21, 2020
c075bc7
update package-lock, beginning to add photo popup...
Nov 21, 2020
3446c6c
slowly implement slider stuff
Nov 21, 2020
42d53f0
context place photos OK
Nov 21, 2020
6807c25
beginning photo context menu
Nov 21, 2020
729a36e
reset photo coords ok
Nov 22, 2020
668eb07
add slider component
Nov 22, 2020
fbf1a68
refactor, put map stuff in a component
Nov 22, 2020
e5f9202
fix slider apparition
Nov 22, 2020
e6a927f
handle photo cluster right click
Nov 22, 2020
bd1e7e1
new feature :-) reset photo cluster geo data
Nov 22, 2020
f7b3ef5
implement and fix routing
Nov 22, 2020
2e047d4
improve routing control design
Nov 22, 2020
53d8261
now adding routing waypoint before the last instead of after
Nov 22, 2020
8c5fdaf
hide routing export button when there is no routing plan
Nov 23, 2020
5a8448e
map context menu routing actions ok
Nov 23, 2020
12674e2
add empty search bar
Nov 23, 2020
e879f54
almost nothing
Nov 23, 2020
9b6b686
begin to implement photo move
Nov 23, 2020
97d3942
photo move global switch ok
Nov 23, 2020
b0bc188
details
Nov 23, 2020
4df6a00
almost hide tooltip when photos are draggable, always reload after mo…
Nov 23, 2020
c538633
add spiderfy cluster context menu action
Nov 23, 2020
e476ba7
fix cluster icon position
Nov 23, 2020
ff07b67
disabled photo tooltip when it's draggable
Nov 23, 2020
7872f03
change map cursor when a controller is loading
Nov 23, 2020
067e598
implement photo move/reset action history
Nov 24, 2020
a0d51f1
map crtl+z/crtl+Z to undo/redo
Nov 24, 2020
5736b76
global use of tooltip directive
Nov 26, 2020
736521d
begin to implement external routing plan
Nov 26, 2020
b2c9bfd
structure of next gen routing is there, a few interactions with new p…
Nov 26, 2020
403ee71
going on routing engine with external steps using multiselect
Nov 27, 2020
1430af1
search field now gets data, improve its design
Nov 28, 2020
e4e49e1
search is starting to look good
Nov 28, 2020
f7372de
new routing plan is now reactive
Nov 28, 2020
19b2e63
move export route button out of routing machine, hide machine interna…
Nov 28, 2020
39a9936
polish routing/search control design
Nov 29, 2020
378cd01
going on routing/search
Nov 29, 2020
d163d34
fix search field selected option design
Nov 29, 2020
8e2aec7
beginning to implement favorites
Nov 30, 2020
5d94932
beginning favorites layer
Nov 30, 2020
ca3bf96
manage zoom on favorites/categories
Dec 1, 2020
6f96d76
favorite edition works
Dec 1, 2020
4a4d090
add/delete favorite
Dec 2, 2020
14e6785
drag favorite ok
Dec 2, 2020
2a97b4c
make fav marker and cluster marker click area larger
Dec 2, 2020
82fa61c
delete favorite cluster
Dec 2, 2020
0536e6f
toggle all fav catagories
Dec 2, 2020
214c2e4
adapt favorite markers color to theme
Dec 3, 2020
1cbdf51
make action history mechanism generic
Dec 3, 2020
45aa8b2
favorite add cancel/redo OK
Dec 3, 2020
1301b44
photo and favorite action history OK
Dec 3, 2020
2568f5a
don't reload photos after having dragged one
Dec 3, 2020
0f15b15
so easy to add new search data
Dec 3, 2020
75c0f4a
new routing button to zoom on current route
Dec 3, 2020
e3e1202
rename fav category + history OK
Dec 4, 2020
8d1edb1
delete/export fav category + history OK
Dec 4, 2020
7eb0630
export enabled fav categories ok
Dec 4, 2020
0edb422
import favorites from file ok
Dec 4, 2020
c64661e
topright history control ok
Dec 4, 2020
e60178d
same fav icon in map and navigation menu
Dec 4, 2020
2bb5f9c
design details
Dec 4, 2020
012cf7c
get/create/delete fav category share link ok
Dec 4, 2020
b82793d
update package-lock
Dec 4, 2020
64e54df
fix public fav share scripts
Dec 4, 2020
76fed0c
take care of share token after renaming fav category
Dec 5, 2020
266f63e
fix various small design issues
Dec 5, 2020
7fb61d4
beginning to implement POI search
Dec 8, 2020
798f388
implement opening hours in poi popups
Dec 8, 2020
a52f38c
implement left click search popup
Dec 8, 2020
c6a0eb5
basic slider working
Dec 10, 2020
c4d6285
new slider operational with photos and favorites
Dec 10, 2020
fbbe9f0
avoid opening left click search popup when something is spiderfied
Dec 10, 2020
050e7b1
use real axios for non-nextcloud requests
Dec 10, 2020
8fa53f9
move away poi search data declaration
Dec 10, 2020
430db3e
optimize and clarify filtering
Dec 10, 2020
64e89d9
locate control ok
Dec 10, 2020
55415c5
track me OK
Dec 10, 2020
16e71c6
bump js libs
Dec 11, 2020
477f184
avoid POIs in routing autocomplete search data
Dec 11, 2020
54d1508
find a way to display Mapbox traffic overlay
Dec 11, 2020
8b34339
adjust traffic colors
Dec 11, 2020
49d5b56
avoid left click search if layer selector was open
Dec 11, 2020
a88a243
add empty sidebar
Dec 13, 2020
c262c3d
found mapbox:// traffic style urls
Dec 13, 2020
c2a1bbf
beginning to implement tracks
Dec 13, 2020
1e8ef5d
struggling with tracks navigation
Dec 14, 2020
9f94cc1
manage track color and toggle state
Dec 15, 2020
903cc83
get tracks, parse metadata, parse gpx content
Dec 15, 2020
00b063e
begin to draw tracks
Dec 15, 2020
50e5ea0
add track marker and tooltip
Dec 17, 2020
baf2b64
begin to move fav edition in sidebar
Dec 17, 2020
706e3f9
move fav edition to sidebar
Dec 18, 2020
66f027b
add context menu for single favorite markers
Dec 18, 2020
bb42cd0
nothing
Dec 18, 2020
f457389
implement contact right click
Dec 18, 2020
06292b8
better contact context menu popup placement
Dec 18, 2020
4790713
more use of computed props in contactLayer
Dec 18, 2020
8f75a49
move contact actions up to App
Dec 18, 2020
8bf2f6f
implement contact place/delete history
Dec 18, 2020
0e7dd2e
fix small problems with fav edition form
Dec 21, 2020
d1f0b50
track zoom
Dec 22, 2020
5fb780e
big fight with @raruto/leaflet.elevation, works but still loads d3 fr…
Dec 22, 2020
e10f127
load track data in elevation chart
Dec 22, 2020
1e6bc24
going on track management, sidebar tab, right click...
Dec 23, 2020
bd8dd1c
bump mapbox-gl
Dec 26, 2020
cee493c
put content in track table
Dec 26, 2020
42c9c9e
track table style
Dec 26, 2020
969a7f3
port GpxPod improvements about cumul elevation and max speed calculation
Dec 26, 2020
1a86606
forward track 'change color' click with context menu
Jan 1, 2021
d7ecf51
bump js libs
Jan 1, 2021
c7a49f6
make tracks sort order an option
Jan 2, 2021
8216c61
fix tracks related options
Jan 4, 2021
3829f1e
bump js libs
Feb 7, 2021
0227867
bump js libs
Mar 3, 2021
cbd2b34
beginning to implement devices UI, navigation and loading is there
Mar 3, 2021
a348a03
basic device map display
Mar 4, 2021
028f5db
Fixed issue when adding favorite, bevor address is loaded
tacruc Mar 4, 2021
298ae2d
manage device history toggling
Mar 4, 2021
690e8a5
move forward on devices
Mar 4, 2021
46cd07f
bump safe js libs
Jun 29, 2021
3aed366
bump nc eslint and webpack configs
Jun 29, 2021
77980f8
bump @nc libs
Jun 29, 2021
b6e0ab2
remove some unused js libs
Jun 29, 2021
d2c9214
allow to search for 'my location' in search field and routing
Jun 30, 2021
5bc10ca
fix photo tooltip alignment
Jun 30, 2021
6f35969
fix manual photo move which was not updating photo attributes
Jun 30, 2021
91f3a0f
improve fav navigation
Jun 30, 2021
87d1f40
implement adding favorite from navigation sidebar => then click on map
Jun 30, 2021
60a5af6
fix missing dependency
Jun 30, 2021
cb617f6
use node>=14 and npm>=7
Jun 30, 2021
cefddcf
open sidebar when manually adding a favorite
Jun 30, 2021
c9ca02b
fix responsiveness of sidebar fav edition form
Jun 30, 2021
26b1c74
use bubble counter in every navigation counter slots
Jun 30, 2021
2066b83
fix style of contact placement popup
Jun 30, 2021
0cf87e6
simplify sidebar layout, no tabs
Jun 30, 2021
45e38f4
fix box shadows, fix device icons with dark theme
Jun 30, 2021
05753c4
use svg coloring for favorite marker icons, add box-shadow
Jun 30, 2021
39e2817
escape cancels adding favorite, fix sidebar mode when opened after fa…
Jul 1, 2021
97d3277
remember last used fav category when editing/creating for new favs, a…
Jul 1, 2021
d2114a3
change fav icon when selected, properly deselect when needed
Jul 1, 2021
b42e3ac
make favorite marker real clickable area round
Jul 1, 2021
32cf392
add africa true size text/link
Jul 1, 2021
c4b21db
block horiz resize of contact placement address textarea
Jul 1, 2021
4cbdceb
fix apparition of nav counters when hidden on page load
Jul 1, 2021
081e51b
change shadow color for selected track, clarify track/fav selection
Jul 1, 2021
59f5f2a
contact placement progressive contact search instead of getting all c…
Jul 2, 2021
c460983
fix contact avatar display in placement multiselect, placement marker…
Jul 2, 2021
cac2171
fix contact placement popup style
Jul 2, 2021
c366ff8
make 'my location' the first search suggestion
Jul 2, 2021
8796717
search device ok
Jul 2, 2021
7211a54
basic track search ok
Jul 2, 2021
0d920c2
zoom on track bounds when searching, different behaviour for routing
Jul 2, 2021
6901946
zoom on device bounds when searching, different behaviour for routing
Jul 2, 2021
74942ad
fix gpx parsing, avoid points with missing coordinates
Jul 2, 2021
b3dff23
zoom on unloaded device or track when enabling them with nav
Jul 2, 2021
9eef0cb
zoom on route when one is selected
Jul 2, 2021
8d321bc
fix small style issues
Jul 2, 2021
482f2eb
nothing
Jul 5, 2021
5fbb9bf
remove leaflet.elevation stuff in makefile as it's not used anymore
Jul 5, 2021
88928bb
fix direct link to contact, requires contacts >= v4.0.0
Jul 5, 2021
b564253
add begin date in track tooltip
Jul 5, 2021
fbc1408
add device hover marker with info tooltip
Jul 5, 2021
247854b
add track hover marker with info tooltip
Jul 5, 2021
7d7821a
display search result
Jul 19, 2021
4906f17
custom search result filter in multiselect to be accent insensitive
Jul 19, 2021
02313ea
on routing step selection => focus on next step field
Jul 20, 2021
97b5703
safe dependency update
Aug 23, 2021
8515987
bump some major dependencies
Aug 23, 2021
7e27af1
fix build
Aug 23, 2021
697931d
implement map actions that other apps can register
Aug 23, 2021
02592b7
implement context location share (copy geo link to clipboard)
Aug 23, 2021
e212fcd
Merge branch 'master' into enh/vue-rewrite
Mar 14, 2022
115f426
repair publich sharing vue stuff
Mar 14, 2022
e245e67
simplify js dependencies
Mar 14, 2022
2041f16
remove leaflet.markercluster dependency
Mar 14, 2022
2c8bfd4
fix navigation item collapse and default slot
Mar 14, 2022
3955a2c
fix ClickSearchPopup marker icon
Mar 14, 2022
47ca0d0
Fixed gpx tracks with no timestamps and nicer handling of firstPoint …
tacruc Mar 17, 2022
5a2d4b6
fixes elevation graph by downgrade "@raruto/leaflet-elevation" to "^1…
tacruc Mar 17, 2022
75340f8
Fixes a glitch, changing the shown elevation data.
tacruc Mar 17, 2022
a01d43c
Give user feedback, after exporting routing.
tacruc Mar 17, 2022
79e08a6
Disable Contacts group zoom button if group is empty
tacruc Mar 17, 2022
0522312
Fix duplicated key error in ContactLayer
tacruc Mar 23, 2022
359989d
Disable sharing of Personal category. (Doesn't work and doesn't make …
tacruc Mar 24, 2022
5e0c504
Fixes option is null, on contacts with no category or if the category…
tacruc Mar 24, 2022
d0fe8d7
Fix placing contacts on places without address.
tacruc Mar 24, 2022
9ea678a
time Slider filter tracks
tacruc Mar 29, 2022
67be272
Improved Slider, set start end via prop
tacruc Mar 29, 2022
e24095e
Improoved filtering of tracks, zoom to bound set times too
tacruc Mar 29, 2022
3a2f4d8
Filter Device Tracks by time
tacruc Mar 29, 2022
ac6e093
export only shown part of device
tacruc Mar 29, 2022
c44cdd4
Uses binSearch to filter device points. Faster filtering feels fast,
tacruc Apr 1, 2022
e7dfe46
Use binSearch to filter Photos
tacruc Apr 1, 2022
0983bca
Use bin search to filter Track Segments
tacruc Apr 1, 2022
004c6ec
Included @nextcloud/event-bus": "^2.1.1
tacruc Mar 20, 2022
7d491c6
Disabled Files Sidebar Tab, Notworking anyways
tacruc Mar 20, 2022
2e23a2b
Make the Viewer aware of maps sidebar
tacruc Mar 20, 2022
df9d7ba
Make sidebar fullscreen, when viewer is opened
tacruc Mar 20, 2022
f31d345
Dummy PhotoSidebarTab
tacruc Mar 21, 2022
6c0d881
Nicer photo sidebar
tacruc Mar 21, 2022
33cc2a1
Improve default Sidebar
tacruc Mar 21, 2022
3074586
Show favorits sidebar Icon in compact
tacruc Mar 21, 2022
c55b6dd
Add image menu element open sidebar
tacruc Mar 22, 2022
e8051d7
Don't open sidebar if clicked on cluster
tacruc Mar 22, 2022
27b4e4c
Keep sidebar content if sidebar is toggled (onMainDetailClicked)
tacruc Mar 22, 2022
e25e6b3
Fix viewer assumes sidebar is opened on pageload
tacruc Mar 22, 2022
4b8aff2
Merge pull request #700 from nextcloud/enh/vue-image-sidebar
tacruc Apr 14, 2022
1fd6e93
Merge branch 'master' into enh/vue-rewrite
tacruc Apr 14, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 15 additions & 25 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,26 +1,16 @@
module.exports = {
root: true,
env: {
node: true
},
extends: [
"nextcloud"
],
rules: {
"vue/component-name-in-template-casing": ["error", "PascalCase"],
"no-console": process.env.NODE_ENV === "production" ? "error" : "off",
"no-debugger": process.env.NODE_ENV === "production" ? "error" : "off"
},
globals: {
OC: false,
OCA: false,
t: false,
n: false,
$: false // TODO: remove once jQuery has been removed
},
parserOptions: {
ecmaVersion: 6,
sourceType: "module",
parser: "babel-eslint"
}
};
globals: {
appVersion: true
},
parserOptions: {
requireConfigFile: false
},
extends: [
'@nextcloud'
],
rules: {
'jsdoc/require-jsdoc': 'off',
'jsdoc/tag-lines': 'off',
'vue/first-attribute-linebreak': 'off'
}
}
18 changes: 0 additions & 18 deletions .stylelintrc.json

This file was deleted.

2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,11 @@ endif
.PHONY: npm
npm:
$(npm) ci
sed -i.bak 's/L\.Browser\.touch/L.Browser.mobile/g' node_modules/leaflet.elevation/dist/Leaflet.Elevation-0.0.2.min.js && rm node_modules/leaflet.elevation/dist/Leaflet.Elevation-0.0.2.min.js.bak
$(npm) run build

.PHONY: npm-dev
npm-dev:
$(npm) ci
sed -i.bak 's/L\.Browser\.touch/L.Browser.mobile/g' node_modules/leaflet.elevation/dist/Leaflet.Elevation-0.0.2.min.js && rm node_modules/leaflet.elevation/dist/Leaflet.Elevation-0.0.2.min.js.bak
$(npm) run dev

# Removes the appstore build
Expand Down
4 changes: 3 additions & 1 deletion appinfo/application.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@


class Application extends App {
public function __construct (array $urlParams=array()) {
public const APP_ID = 'maps';

public function __construct (array $urlParams = array()) {
parent::__construct('maps', $urlParams);

$container = $this->getContainer();
Expand Down
5 changes: 3 additions & 2 deletions appinfo/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@


// utils
['name' => 'utils#getOptionsValues', 'url' => '/getOptionsValues', 'verb' => 'POST'],
['name' => 'utils#getOptionsValues', 'url' => '/getOptionsValues', 'verb' => 'GET'],
['name' => 'utils#saveOptionValue', 'url' => '/saveOptionValue', 'verb' => 'POST'],
['name' => 'utils#setRoutingSettings', 'url' => '/setRoutingSettings', 'verb' => 'POST'],
['name' => 'utils#getTrafficStyle', 'url' => '/style/traffic', 'verb' => 'GET'],

// photos
['name' => 'photos#getPhotosFromDb', 'url' => '/photos', 'verb' => 'GET'],
Expand All @@ -28,7 +29,7 @@

// contacts
['name' => 'contacts#getContacts', 'url' => '/contacts', 'verb' => 'GET'],
['name' => 'contacts#getAllContacts', 'url' => '/contacts-all', 'verb' => 'GET'],
['name' => 'contacts#searchContacts', 'url' => '/contacts-search', 'verb' => 'GET'],
['name' => 'contacts#placeContact', 'url' => '/contacts/{bookid}/{uri}', 'verb' => 'PUT'],
['name' => 'contacts#deleteContactAddress', 'url' => '/contacts/{bookid}/{uri}', 'verb' => 'DELETE'],
['name' => 'contacts#getContactLetterAvatar', 'url' => '/contacts-avatar', 'verb' => 'GET'],
Expand Down
Loading