Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Team 14 - IDATT1002
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

f208d6ff

Commit f208d6ff authored 4 years ago by Mads Lundegaard

Downloads
- Plain Diff

Merge branch 'refactor/map-markers' into 'dev'

Add infowindows to markers

See merge request !155

parents e1e1813d a06d16af

No related branches found

No related tags found

2 merge requests!165Weekly merge to Master,!155Add infowindows to markers

Pipeline #80943 failed 4 years ago

Stage: build

Stage: test

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/NTNU/IDATT1002/controllers/ImageMapFactory.java 95 additions, 31 deletions

...main/java/NTNU/IDATT1002/controllers/ImageMapFactory.java
src/main/java/NTNU/IDATT1002/controllers/Map.java 3 additions, 2 deletions

src/main/java/NTNU/IDATT1002/controllers/Map.java
src/main/java/NTNU/IDATT1002/models/Image.java 2 additions, 3 deletions

src/main/java/NTNU/IDATT1002/models/Image.java
src/main/java/NTNU/IDATT1002/models/Metadata.java 16 additions, 0 deletions

src/main/java/NTNU/IDATT1002/models/Metadata.java
src/main/java/NTNU/IDATT1002/utils/MetadataStringFormatter.java 42 additions, 19 deletions

...in/java/NTNU/IDATT1002/utils/MetadataStringFormatter.java
src/main/resources/NTNU/IDATT1002/map.fxml 1 addition, 1 deletion

src/main/resources/NTNU/IDATT1002/map.fxml
src/test/java/NTNU/IDATT1002/utils/MetadataStringFormatterTest.java 1 addition, 1 deletion

...ava/NTNU/IDATT1002/utils/MetadataStringFormatterTest.java

with 160 additions and 57 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment