merge: database

README.md

 # PROG2900
 
 ## Dependencies
-### Python
+
+## Endpoints
+```
+\
+\update_map
+\get_relation
+\add_new_lake?lake=name
+```
+
+### Server
 To run the server...
 
-### Dart & Flutter
+### Application
 
 
 ### Database
@@ -13,8 +22,41 @@ Precompiled binaries can be found on https://www.sqlite.org/download.html. Extra
 binary in a folder and note its path. Add the path to your system environment variables. Now you can 
 manage the SQLite database.
 
-## Endpoints
+## Adding new lakes
+To add a new lake to the system, go to https://overpass-turbo.eu/. 
+Once you have navigated to Overpass API, enter
+the Overpass query below in the left field, but swap 'lakeName' out
+with the name of the lake you want to add. Once the query has been adjusted,
+press the 'Run' button.
+
+```
+[out:json];
+(
+  way["natural"="water"]["name"="lakeName"];
+  relation["natural"="water"]["name"="lakeName"];
+);
+(._;>;);
+out body;
+```
+
+![img.png](images/overpass-query.png)
+![img.png](images/geojson-export.png)
+
+If a text box saying "This query returned quite a lot of data (approx. x MB). Your browser may have a hard time trying to render this. Do you really want to continue?
+" appears, press 'continue anyway'. Double check that you have
+the correct lake, then press 'Export'. In the 'Export' menu, download the shape data as
+GeoJson. Once downloaded, name the file the *lakeName.json, and move the file into
+IceMap/server/lake_relations. Once you have added the file, run map division...
+
+![img.png](images/geojson-file.png)
+
+The result will be two new files named lakeName_centers.txt and lakeName_div.json. The original
+lakeName.geojson file should also remain in the system. Additionally, the file named all_lake_names.json 
+should be updated to contain the newly added lake name.
+
+![img.png](images/resulting-files.png)
+
 
-## Bugs
+## Known bugs
 
 ## Developers

app/assets/fonts/rokkitt/OFL.txt

-Copyright 2016 The Rokkit Project Authors (https://github.com/googlefonts/RokkittFont)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-https://openfontlicense.org
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.

app/assets/fonts/rokkitt/README.txt

-Rokkitt Variable Font
-=====================
-
-This download contains Rokkitt as both variable fonts and static fonts.
-
-Rokkitt is a variable font with this axis:
-  wght
-
-This means all the styles are contained in these files:
-  Rokkitt-VariableFont_wght.ttf
-  Rokkitt-Italic-VariableFont_wght.ttf
-
-If your app fully supports variable fonts, you can now pick intermediate styles
-that aren’t available as static fonts. Not all apps support variable fonts, and
-in those cases you can use the static font files for Rokkitt:
-  static/Rokkitt-Thin.ttf
-  static/Rokkitt-ExtraLight.ttf
-  static/Rokkitt-Light.ttf
-  static/Rokkitt-Regular.ttf
-  static/Rokkitt-Medium.ttf
-  static/Rokkitt-SemiBold.ttf
-  static/Rokkitt-Bold.ttf
-  static/Rokkitt-ExtraBold.ttf
-  static/Rokkitt-Black.ttf
-  static/Rokkitt-ThinItalic.ttf
-  static/Rokkitt-ExtraLightItalic.ttf
-  static/Rokkitt-LightItalic.ttf
-  static/Rokkitt-Italic.ttf
-  static/Rokkitt-MediumItalic.ttf
-  static/Rokkitt-SemiBoldItalic.ttf
-  static/Rokkitt-BoldItalic.ttf
-  static/Rokkitt-ExtraBoldItalic.ttf
-  static/Rokkitt-BlackItalic.ttf
-
-Get started
------------
-
-1. Install the font files you want to use
-
-2. Use your app's font picker to view the font family and all the
-available styles
-
-Learn more about variable fonts
--------------------------------
-
-  https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts
-  https://variablefonts.typenetwork.com
-  https://medium.com/variable-fonts
-
-In desktop apps
-
-  https://theblog.adobe.com/can-variable-fonts-illustrator-cc
-  https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts
-
-Online
-
-  https://developers.google.com/fonts/docs/getting_started
-  https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide
-  https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts
-
-Installing fonts
-
-  MacOS: https://support.apple.com/en-us/HT201749
-  Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux
-  Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows
-
-Android Apps
-
-  https://developers.google.com/fonts/docs/android
-  https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts
-
-License
--------
-Please read the full license text (OFL.txt) to understand the permissions,
-restrictions and requirements for usage, redistribution, and modification.
-
-You can use them in your products & projects – print or digital,
-commercial or otherwise.
-
-This isn't legal advice, please consider consulting a lawyer and see the full
-license for all details.