Added beginning files; nothing yet works.
This commit is contained in:
parent
e57960d50a
commit
55085a78c5
24
CHANGELOG.md
Normal file
24
CHANGELOG.md
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
# Change Log
|
||||||
|
All notable changes to this project will be documented in this file. This change log follows the conventions of [keepachangelog.com](http://keepachangelog.com/).
|
||||||
|
|
||||||
|
## [Unreleased]
|
||||||
|
### Changed
|
||||||
|
- Add a new arity to `make-widget-async` to provide a different widget shape.
|
||||||
|
|
||||||
|
## [0.1.1] - 2018-06-19
|
||||||
|
### Changed
|
||||||
|
- Documentation on how to make the widgets.
|
||||||
|
|
||||||
|
### Removed
|
||||||
|
- `make-widget-sync` - we're all async, all the time.
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Fixed widget maker to keep working when daylight savings switches over.
|
||||||
|
|
||||||
|
## 0.1.0 - 2018-06-19
|
||||||
|
### Added
|
||||||
|
- Files from the new template.
|
||||||
|
- Widget maker public API - `make-widget-sync`.
|
||||||
|
|
||||||
|
[Unreleased]: https://github.com/your-name/adl-data/compare/0.1.1...HEAD
|
||||||
|
[0.1.1]: https://github.com/your-name/adl-data/compare/0.1.0...0.1.1
|
517
LICENSE
517
LICENSE
|
@ -1,339 +1,258 @@
|
||||||
GNU GENERAL PUBLIC LICENSE
|
# GNU GENERAL PUBLIC LICENSE
|
||||||
Version 2, June 1991
|
|
||||||
|
|
||||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
Version 2, June 1991
|
||||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
|
||||||
of this license document, but changing it is not allowed.
|
|
||||||
|
|
||||||
Preamble
|
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
|
||||||
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
|
|
||||||
The licenses for most software are designed to take away your
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
freedom to share and change it. By contrast, the GNU General Public
|
of this license document, but changing it is not allowed.
|
||||||
License is intended to guarantee your freedom to share and change free
|
Preamble
|
||||||
software--to make sure the software is free for all its users. This
|
|
||||||
General Public License applies to most of the Free Software
|
|
||||||
Foundation's software and to any other program whose authors commit to
|
|
||||||
using it. (Some other Free Software Foundation software is covered by
|
|
||||||
the GNU Lesser General Public License instead.) You can apply it to
|
|
||||||
your programs, too.
|
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
The licenses for most software are designed to take away your freedom to share
|
||||||
price. Our General Public Licenses are designed to make sure that you
|
and change it. By contrast, the GNU General Public License is intended to guarantee
|
||||||
have the freedom to distribute copies of free software (and charge for
|
your freedom to share and change free software--to make sure the software is free
|
||||||
this service if you wish), that you receive source code or can get it
|
for all its users. This General Public License applies to most of the Free
|
||||||
if you want it, that you can change the software or use pieces of it
|
Software Foundation's software and to any other program whose authors commit to
|
||||||
in new free programs; and that you know you can do these things.
|
using it. (Some other Free Software Foundation software is covered by the GNU
|
||||||
|
Lesser General Public License instead.) You can apply it to your programs, too.
|
||||||
|
|
||||||
To protect your rights, we need to make restrictions that forbid
|
When we speak of free software, we are referring to freedom, not price. Our
|
||||||
anyone to deny you these rights or to ask you to surrender the rights.
|
General Public Licenses are designed to make sure that you have the freedom to
|
||||||
These restrictions translate to certain responsibilities for you if you
|
distribute copies of free software (and charge for this service if you wish),
|
||||||
distribute copies of the software, or if you modify it.
|
that you receive source code or can get it if you want it, that you can change
|
||||||
|
the software or use pieces of it in new free programs; and that you know you
|
||||||
|
can do these things.
|
||||||
|
|
||||||
For example, if you distribute copies of such a program, whether
|
To protect your rights, we need to make restrictions that forbid anyone to
|
||||||
gratis or for a fee, you must give the recipients all the rights that
|
deny you these rights or to ask you to surrender the rights. These restrictions
|
||||||
you have. You must make sure that they, too, receive or can get the
|
translate to certain responsibilities for you if you distribute copies of the
|
||||||
source code. And you must show them these terms so they know their
|
software, or if you modify it.
|
||||||
rights.
|
|
||||||
|
|
||||||
We protect your rights with two steps: (1) copyright the software, and
|
For example, if you distribute copies of such a program, whether gratis or for
|
||||||
(2) offer you this license which gives you legal permission to copy,
|
a fee, you must give the recipients all the rights that you have. You must make
|
||||||
distribute and/or modify the software.
|
sure that they, too, receive or can get the source code. And you must show them
|
||||||
|
these terms so they know their rights.
|
||||||
|
|
||||||
Also, for each author's protection and ours, we want to make certain
|
We protect your rights with two steps: (1) copyright the software, and (2)
|
||||||
that everyone understands that there is no warranty for this free
|
offer you this license which gives you legal permission to copy, distribute
|
||||||
software. If the software is modified by someone else and passed on, we
|
and/or modify the software.
|
||||||
want its recipients to know that what they have is not the original, so
|
|
||||||
that any problems introduced by others will not reflect on the original
|
|
||||||
authors' reputations.
|
|
||||||
|
|
||||||
Finally, any free program is threatened constantly by software
|
Also, for each author's protection and ours, we want to make certain that
|
||||||
patents. We wish to avoid the danger that redistributors of a free
|
everyone understands that there is no warranty for this free software. If the
|
||||||
program will individually obtain patent licenses, in effect making the
|
software is modified by someone else and passed on, we want its recipients to
|
||||||
program proprietary. To prevent this, we have made it clear that any
|
know that what they have is not the original, so that any problems introduced
|
||||||
patent must be licensed for everyone's free use or not licensed at all.
|
by others will not reflect on the original authors' reputations.
|
||||||
|
|
||||||
The precise terms and conditions for copying, distribution and
|
Finally, any free program is threatened constantly by software patents. We wish
|
||||||
modification follow.
|
to avoid the danger that redistributors of a free program will individually
|
||||||
|
obtain patent licenses, in effect making the program proprietary. To prevent
|
||||||
|
this, we have made it clear that any patent must be licensed for everyone's
|
||||||
|
free use or not licensed at all.
|
||||||
|
|
||||||
GNU GENERAL PUBLIC LICENSE
|
The precise terms and conditions for copying, distribution and modification follow.
|
||||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
|
||||||
|
|
||||||
0. This License applies to any program or other work which contains
|
## TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||||
a notice placed by the copyright holder saying it may be distributed
|
|
||||||
under the terms of this General Public License. The "Program", below,
|
|
||||||
refers to any such program or work, and a "work based on the Program"
|
|
||||||
means either the Program or any derivative work under copyright law:
|
|
||||||
that is to say, a work containing the Program or a portion of it,
|
|
||||||
either verbatim or with modifications and/or translated into another
|
|
||||||
language. (Hereinafter, translation is included without limitation in
|
|
||||||
the term "modification".) Each licensee is addressed as "you".
|
|
||||||
|
|
||||||
Activities other than copying, distribution and modification are not
|
0. This License applies to any program or other work which contains a notice
|
||||||
covered by this License; they are outside its scope. The act of
|
placed by the copyright holder saying it may be distributed under the terms of
|
||||||
running the Program is not restricted, and the output from the Program
|
this General Public License. The "Program", below, refers to any such program
|
||||||
is covered only if its contents constitute a work based on the
|
or work, and a "work based on the Program" means either the Program or any
|
||||||
Program (independent of having been made by running the Program).
|
derivative work under copyright law: that is to say, a work containing the
|
||||||
Whether that is true depends on what the Program does.
|
Program or a portion of it, either verbatim or with modifications and/or
|
||||||
|
translated into another language. (Hereinafter, translation is included without
|
||||||
|
limitation in the term "modification".) Each licensee is addressed as "you".
|
||||||
|
|
||||||
1. You may copy and distribute verbatim copies of the Program's
|
Activities other than copying, distribution and modification are not covered by
|
||||||
source code as you receive it, in any medium, provided that you
|
this License; they are outside its scope. The act of running the Program is not
|
||||||
conspicuously and appropriately publish on each copy an appropriate
|
restricted, and the output from the Program is covered only if its contents
|
||||||
copyright notice and disclaimer of warranty; keep intact all the
|
constitute a work based on the Program (independent of having been made by
|
||||||
notices that refer to this License and to the absence of any warranty;
|
running the Program). Whether that is true depends on what the Program does.
|
||||||
and give any other recipients of the Program a copy of this License
|
|
||||||
along with the Program.
|
|
||||||
|
|
||||||
You may charge a fee for the physical act of transferring a copy, and
|
1. You may copy and distribute verbatim copies of the Program's source code as
|
||||||
you may at your option offer warranty protection in exchange for a fee.
|
you receive it, in any medium, provided that you conspicuously and appropriately
|
||||||
|
publish on each copy an appropriate copyright notice and disclaimer of warranty;
|
||||||
|
keep intact all the notices that refer to this License and to the absence of any
|
||||||
|
warranty; and give any other recipients of the Program a copy of this License
|
||||||
|
along with the Program.
|
||||||
|
|
||||||
2. You may modify your copy or copies of the Program or any portion
|
You may charge a fee for the physical act of transferring a copy, and you may at
|
||||||
of it, thus forming a work based on the Program, and copy and
|
your option offer warranty protection in exchange for a fee.
|
||||||
distribute such modifications or work under the terms of Section 1
|
|
||||||
above, provided that you also meet all of these conditions:
|
|
||||||
|
|
||||||
a) You must cause the modified files to carry prominent notices
|
2. You may modify your copy or copies of the Program or any portion of it, thus
|
||||||
stating that you changed the files and the date of any change.
|
forming a work based on the Program, and copy and distribute such modifications
|
||||||
|
or work under the terms of Section 1 above, provided that you also meet all of
|
||||||
|
these conditions:
|
||||||
|
|
||||||
b) You must cause any work that you distribute or publish, that in
|
a) You must cause the modified files to carry prominent notices stating that
|
||||||
whole or in part contains or is derived from the Program or any
|
you changed the files and the date of any change.
|
||||||
part thereof, to be licensed as a whole at no charge to all third
|
b) You must cause any work that you distribute or publish, that in whole or in
|
||||||
parties under the terms of this License.
|
part contains or is derived from the Program or any part thereof, to be
|
||||||
|
licensed as a whole at no charge to all third parties under the terms of this
|
||||||
|
License.
|
||||||
|
c) If the modified program normally reads commands interactively when run, you
|
||||||
|
must cause it, when started running for such interactive use in the most
|
||||||
|
ordinary way, to print or display an announcement including an appropriate
|
||||||
|
copyright notice and a notice that there is no warranty (or else, saying
|
||||||
|
that you provide a warranty) and that users may redistribute the program
|
||||||
|
under these conditions, and telling the user how to view a copy of this
|
||||||
|
License. (Exception: if the Program itself is interactive but does not
|
||||||
|
normally print such an announcement, your work based on the Program is not
|
||||||
|
required to print an announcement.)
|
||||||
|
|
||||||
c) If the modified program normally reads commands interactively
|
These requirements apply to the modified work as a whole. If identifiable
|
||||||
when run, you must cause it, when started running for such
|
sections of that work are not derived from the Program, and can be reasonably
|
||||||
interactive use in the most ordinary way, to print or display an
|
considered independent and separate works in themselves, then this License,
|
||||||
announcement including an appropriate copyright notice and a
|
and its terms, do not apply to those sections when you distribute them as
|
||||||
notice that there is no warranty (or else, saying that you provide
|
separate works. But when you distribute the same sections as part of a whole
|
||||||
a warranty) and that users may redistribute the program under
|
which is a work based on the Program, the distribution of the whole must be on
|
||||||
these conditions, and telling the user how to view a copy of this
|
the terms of this License, whose permissions for other licensees extend to the
|
||||||
License. (Exception: if the Program itself is interactive but
|
entire whole, and thus to each and every part regardless of who wrote it.
|
||||||
does not normally print such an announcement, your work based on
|
|
||||||
the Program is not required to print an announcement.)
|
|
||||||
|
|
||||||
These requirements apply to the modified work as a whole. If
|
Thus, it is not the intent of this section to claim rights or contest your
|
||||||
identifiable sections of that work are not derived from the Program,
|
rights to work written entirely by you; rather, the intent is to exercise the
|
||||||
and can be reasonably considered independent and separate works in
|
right to control the distribution of derivative or collective works based on
|
||||||
themselves, then this License, and its terms, do not apply to those
|
the Program.
|
||||||
sections when you distribute them as separate works. But when you
|
|
||||||
distribute the same sections as part of a whole which is a work based
|
|
||||||
on the Program, the distribution of the whole must be on the terms of
|
|
||||||
this License, whose permissions for other licensees extend to the
|
|
||||||
entire whole, and thus to each and every part regardless of who wrote it.
|
|
||||||
|
|
||||||
Thus, it is not the intent of this section to claim rights or contest
|
In addition, mere aggregation of another work not based on the Program with the
|
||||||
your rights to work written entirely by you; rather, the intent is to
|
Program (or with a work based on the Program) on a volume of a storage or
|
||||||
exercise the right to control the distribution of derivative or
|
distribution medium does not bring the other work under the scope of this
|
||||||
collective works based on the Program.
|
License.
|
||||||
|
|
||||||
In addition, mere aggregation of another work not based on the Program
|
3. You may copy and distribute the Program (or a work based on it, under
|
||||||
with the Program (or with a work based on the Program) on a volume of
|
Section 2) in object code or executable form under the terms of Sections 1
|
||||||
a storage or distribution medium does not bring the other work under
|
and 2 above provided that you also do one of the following:
|
||||||
the scope of this License.
|
|
||||||
|
|
||||||
3. You may copy and distribute the Program (or a work based on it,
|
a) Accompany it with the complete corresponding machine-readable source code,
|
||||||
under Section 2) in object code or executable form under the terms of
|
which must be distributed under the terms of Sections 1 and 2 above on a
|
||||||
Sections 1 and 2 above provided that you also do one of the following:
|
medium customarily used for software interchange; or,
|
||||||
|
b) Accompany it with a written offer, valid for at least three years, to give
|
||||||
|
any third party, for a charge no more than your cost of physically
|
||||||
|
performing source distribution, a complete machine-readable copy of the
|
||||||
|
corresponding source code, to be distributed under the terms of Sections 1
|
||||||
|
and 2 above on a medium customarily used for software interchange; or,
|
||||||
|
c) Accompany it with the information you received as to the offer to distribute
|
||||||
|
corresponding source code. (This alternative is allowed only for
|
||||||
|
noncommercial distribution and only if you received the program in object
|
||||||
|
code or executable form with such an offer, in accord with Subsection b
|
||||||
|
above.)
|
||||||
|
|
||||||
a) Accompany it with the complete corresponding machine-readable
|
The source code for a work means the preferred form of the work for making
|
||||||
source code, which must be distributed under the terms of Sections
|
modifications to it. For an executable work, complete source code means all the
|
||||||
1 and 2 above on a medium customarily used for software interchange; or,
|
source code for all modules it contains, plus any associated interface
|
||||||
|
definition files, plus the scripts used to control compilation and installation
|
||||||
|
of the executable. However, as a special exception, the source code distributed
|
||||||
|
need not include anything that is normally distributed (in either source or
|
||||||
|
binary form) with the major components (compiler, kernel, and so on) of the
|
||||||
|
operating system on which the executable runs, unless that component itself
|
||||||
|
accompanies the executable.
|
||||||
|
|
||||||
b) Accompany it with a written offer, valid for at least three
|
If distribution of executable or object code is made by offering access to
|
||||||
years, to give any third party, for a charge no more than your
|
copy from a designated place, then offering equivalent access to copy the
|
||||||
cost of physically performing source distribution, a complete
|
source code from the same place counts as distribution of the source code,
|
||||||
machine-readable copy of the corresponding source code, to be
|
even though third parties are not compelled to copy the source along with the
|
||||||
distributed under the terms of Sections 1 and 2 above on a medium
|
object code.
|
||||||
customarily used for software interchange; or,
|
|
||||||
|
|
||||||
c) Accompany it with the information you received as to the offer
|
4. You may not copy, modify, sublicense, or distribute the Program except as
|
||||||
to distribute corresponding source code. (This alternative is
|
expressly provided under this License. Any attempt otherwise to copy, modify,
|
||||||
allowed only for noncommercial distribution and only if you
|
sublicense or distribute the Program is void, and will automatically
|
||||||
received the program in object code or executable form with such
|
terminate your rights under this License. However, parties who have
|
||||||
an offer, in accord with Subsection b above.)
|
received copies, or rights, from you under this License will not have their
|
||||||
|
licenses terminated so long as such parties remain in full compliance.
|
||||||
|
|
||||||
The source code for a work means the preferred form of the work for
|
5. You are not required to accept this License, since you have not signed it.
|
||||||
making modifications to it. For an executable work, complete source
|
However, nothing else grants you permission to modify or distribute the
|
||||||
code means all the source code for all modules it contains, plus any
|
Program or its derivative works. These actions are prohibited by law if
|
||||||
associated interface definition files, plus the scripts used to
|
you do not accept this License. Therefore, by modifying or distributing
|
||||||
control compilation and installation of the executable. However, as a
|
the Program (or any work based on the Program), you indicate your
|
||||||
special exception, the source code distributed need not include
|
acceptance of this License to do so, and all its terms and conditions
|
||||||
anything that is normally distributed (in either source or binary
|
for copying, distributing or modifying the Program or works based on it.
|
||||||
form) with the major components (compiler, kernel, and so on) of the
|
|
||||||
operating system on which the executable runs, unless that component
|
|
||||||
itself accompanies the executable.
|
|
||||||
|
|
||||||
If distribution of executable or object code is made by offering
|
6. Each time you redistribute the Program (or any work based on the Program),
|
||||||
access to copy from a designated place, then offering equivalent
|
the recipient automatically receives a license from the original licensor
|
||||||
access to copy the source code from the same place counts as
|
to copy, distribute or modify the Program subject to these terms and
|
||||||
distribution of the source code, even though third parties are not
|
conditions. You may not impose any further restrictions on the recipients'
|
||||||
compelled to copy the source along with the object code.
|
exercise of the rights granted herein. You are not responsible for enforcing
|
||||||
|
compliance by third parties to this License.
|
||||||
|
|
||||||
4. You may not copy, modify, sublicense, or distribute the Program
|
7. If, as a consequence of a court judgment or allegation of patent infringement
|
||||||
except as expressly provided under this License. Any attempt
|
or for any other reason (not limited to patent issues), conditions are
|
||||||
otherwise to copy, modify, sublicense or distribute the Program is
|
imposed on you (whether by court order, agreement or otherwise) that
|
||||||
void, and will automatically terminate your rights under this License.
|
contradict the conditions of this License, they do not excuse you from the
|
||||||
However, parties who have received copies, or rights, from you under
|
conditions of this License. If you cannot distribute so as to satisfy
|
||||||
this License will not have their licenses terminated so long as such
|
simultaneously your obligations under this License and any other pertinent
|
||||||
parties remain in full compliance.
|
obligations, then as a consequence you may not distribute the Program at
|
||||||
|
all. For example, if a patent license would not permit royalty-free
|
||||||
|
redistribution of the Program by all those who receive copies directly or
|
||||||
|
indirectly through you, then the only way you could satisfy both it and
|
||||||
|
this License would be to refrain entirely from distribution of the Program.
|
||||||
|
|
||||||
5. You are not required to accept this License, since you have not
|
If any portion of this section is held invalid or unenforceable under any
|
||||||
signed it. However, nothing else grants you permission to modify or
|
particular circumstance, the balance of the section is intended to apply
|
||||||
distribute the Program or its derivative works. These actions are
|
and the section as a whole is intended to apply in other circumstances.
|
||||||
prohibited by law if you do not accept this License. Therefore, by
|
|
||||||
modifying or distributing the Program (or any work based on the
|
|
||||||
Program), you indicate your acceptance of this License to do so, and
|
|
||||||
all its terms and conditions for copying, distributing or modifying
|
|
||||||
the Program or works based on it.
|
|
||||||
|
|
||||||
6. Each time you redistribute the Program (or any work based on the
|
It is not the purpose of this section to induce you to infringe any patents
|
||||||
Program), the recipient automatically receives a license from the
|
or other property right claims or to contest validity of any such claims;
|
||||||
original licensor to copy, distribute or modify the Program subject to
|
this section has the sole purpose of protecting the integrity of the free
|
||||||
these terms and conditions. You may not impose any further
|
software distribution system, which is implemented by public license
|
||||||
restrictions on the recipients' exercise of the rights granted herein.
|
practices. Many people have made generous contributions to the wide range
|
||||||
You are not responsible for enforcing compliance by third parties to
|
of software distributed through that system in reliance on consistent
|
||||||
this License.
|
application of that system; it is up to the author/donor to decide if he or
|
||||||
|
she is willing to distribute software through any other system and a
|
||||||
|
licensee cannot impose that choice.
|
||||||
|
|
||||||
7. If, as a consequence of a court judgment or allegation of patent
|
This section is intended to make thoroughly clear what is believed to be a
|
||||||
infringement or for any other reason (not limited to patent issues),
|
consequence of the rest of this License.
|
||||||
conditions are imposed on you (whether by court order, agreement or
|
|
||||||
otherwise) that contradict the conditions of this License, they do not
|
|
||||||
excuse you from the conditions of this License. If you cannot
|
|
||||||
distribute so as to satisfy simultaneously your obligations under this
|
|
||||||
License and any other pertinent obligations, then as a consequence you
|
|
||||||
may not distribute the Program at all. For example, if a patent
|
|
||||||
license would not permit royalty-free redistribution of the Program by
|
|
||||||
all those who receive copies directly or indirectly through you, then
|
|
||||||
the only way you could satisfy both it and this License would be to
|
|
||||||
refrain entirely from distribution of the Program.
|
|
||||||
|
|
||||||
If any portion of this section is held invalid or unenforceable under
|
8. If the distribution and/or use of the Program is restricted in certain
|
||||||
any particular circumstance, the balance of the section is intended to
|
countries either by patents or by copyrighted interfaces, the original
|
||||||
apply and the section as a whole is intended to apply in other
|
copyright holder who places the Program under this License may add an
|
||||||
circumstances.
|
explicit geographical distribution limitation excluding those countries,
|
||||||
|
so that distribution is permitted only in or among countries not thus
|
||||||
|
excluded. In such case, this License incorporates the limitation as if
|
||||||
|
written in the body of this License.
|
||||||
|
|
||||||
It is not the purpose of this section to induce you to infringe any
|
9. The Free Software Foundation may publish revised and/or new versions of the
|
||||||
patents or other property right claims or to contest validity of any
|
General Public License from time to time. Such new versions will be similar
|
||||||
such claims; this section has the sole purpose of protecting the
|
in spirit to the present version, but may differ in detail to address new
|
||||||
integrity of the free software distribution system, which is
|
problems or concerns.
|
||||||
implemented by public license practices. Many people have made
|
|
||||||
generous contributions to the wide range of software distributed
|
|
||||||
through that system in reliance on consistent application of that
|
|
||||||
system; it is up to the author/donor to decide if he or she is willing
|
|
||||||
to distribute software through any other system and a licensee cannot
|
|
||||||
impose that choice.
|
|
||||||
|
|
||||||
This section is intended to make thoroughly clear what is believed to
|
Each version is given a distinguishing version number. If the Program
|
||||||
be a consequence of the rest of this License.
|
specifies a version number of this License which applies to it and
|
||||||
|
"any later version", you have the option of following the terms and
|
||||||
|
conditions either of that version or of any later version published
|
||||||
|
by the Free Software Foundation. If the Program does not specify a version
|
||||||
|
number of this License, you may choose any version ever published by the
|
||||||
|
Free Software Foundation.
|
||||||
|
|
||||||
8. If the distribution and/or use of the Program is restricted in
|
10. If you wish to incorporate parts of the Program into other free programs
|
||||||
certain countries either by patents or by copyrighted interfaces, the
|
whose distribution conditions are different, write to the author to ask for
|
||||||
original copyright holder who places the Program under this License
|
permission. For software which is copyrighted by the Free Software
|
||||||
may add an explicit geographical distribution limitation excluding
|
Foundation, write to the Free Software Foundation; we sometimes make
|
||||||
those countries, so that distribution is permitted only in or among
|
exceptions for this. Our decision will be guided by the two goals of
|
||||||
countries not thus excluded. In such case, this License incorporates
|
preserving the free status of all derivatives of our free software and of
|
||||||
the limitation as if written in the body of this License.
|
promoting the sharing and reuse of software generally.
|
||||||
|
|
||||||
9. The Free Software Foundation may publish revised and/or new versions
|
NO WARRANTY
|
||||||
of the General Public License from time to time. Such new versions will
|
|
||||||
be similar in spirit to the present version, but may differ in detail to
|
|
||||||
address new problems or concerns.
|
|
||||||
|
|
||||||
Each version is given a distinguishing version number. If the Program
|
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
|
||||||
specifies a version number of this License which applies to it and "any
|
THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||||
later version", you have the option of following the terms and conditions
|
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
||||||
either of that version or of any later version published by the Free
|
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
||||||
Software Foundation. If the Program does not specify a version number of
|
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||||
this License, you may choose any version ever published by the Free Software
|
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO
|
||||||
Foundation.
|
THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM
|
||||||
|
PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
|
||||||
|
CORRECTION.
|
||||||
|
|
||||||
10. If you wish to incorporate parts of the Program into other free
|
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
|
||||||
programs whose distribution conditions are different, write to the author
|
ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE
|
||||||
to ask for permission. For software which is copyrighted by the Free
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
make exceptions for this. Our decision will be guided by the two goals
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
of preserving the free status of all derivatives of our free software and
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
of promoting the sharing and reuse of software generally.
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
NO WARRANTY
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
|
||||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
|
||||||
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
|
||||||
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
|
||||||
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
||||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
|
||||||
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
|
||||||
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
|
||||||
REPAIR OR CORRECTION.
|
|
||||||
|
|
||||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
|
||||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
|
||||||
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
|
||||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
|
||||||
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
|
||||||
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
|
||||||
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
|
||||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
|
||||||
POSSIBILITY OF SUCH DAMAGES.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
How to Apply These Terms to Your New Programs
|
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
|
||||||
possible use to the public, the best way to achieve this is to make it
|
|
||||||
free software which everyone can redistribute and change under these terms.
|
|
||||||
|
|
||||||
To do so, attach the following notices to the program. It is safest
|
|
||||||
to attach them to the start of each source file to most effectively
|
|
||||||
convey the exclusion of warranty; and each file should have at least
|
|
||||||
the "copyright" line and a pointer to where the full notice is found.
|
|
||||||
|
|
||||||
<one line to give the program's name and a brief idea of what it does.>
|
|
||||||
Copyright (C) <year> <name of author>
|
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation; either version 2 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License along
|
|
||||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
|
||||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper mail.
|
|
||||||
|
|
||||||
If the program is interactive, make it output a short notice like this
|
|
||||||
when it starts in an interactive mode:
|
|
||||||
|
|
||||||
Gnomovision version 69, Copyright (C) year name of author
|
|
||||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
|
||||||
This is free software, and you are welcome to redistribute it
|
|
||||||
under certain conditions; type `show c' for details.
|
|
||||||
|
|
||||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
|
||||||
parts of the General Public License. Of course, the commands you use may
|
|
||||||
be called something other than `show w' and `show c'; they could even be
|
|
||||||
mouse-clicks or menu items--whatever suits your program.
|
|
||||||
|
|
||||||
You should also get your employer (if you work as a programmer) or your
|
|
||||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
|
||||||
necessary. Here is a sample; alter the names:
|
|
||||||
|
|
||||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
|
||||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
|
||||||
|
|
||||||
<signature of Ty Coon>, 1 April 1989
|
|
||||||
Ty Coon, President of Vice
|
|
||||||
|
|
||||||
This General Public License does not permit incorporating your program into
|
|
||||||
proprietary programs. If your program is a subroutine library, you may
|
|
||||||
consider it more useful to permit linking proprietary applications with the
|
|
||||||
library. If this is what you want to do, use the GNU Lesser General
|
|
||||||
Public License instead of this License.
|
|
||||||
|
|
14
README.md
Normal file
14
README.md
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
# adl-data
|
||||||
|
|
||||||
|
A Clojure library designed to import data (mainly geographical and electoral data) into YouYesYet. As such, not directly relevant to anyone but me at this stage, but I will ultimately separate out the more generally useful bits of the import scripts and make them available in a library.
|
||||||
|
|
||||||
|
## Usage
|
||||||
|
|
||||||
|
At this stage, who knows?
|
||||||
|
|
||||||
|
## License
|
||||||
|
|
||||||
|
Copyright © 2018 Simon Brooke
|
||||||
|
|
||||||
|
Distributed under the Gnu General Public License either version 2.0 or (at
|
||||||
|
your option) any later version.
|
3
doc/intro.md
Normal file
3
doc/intro.md
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
# Introduction to adl-data
|
||||||
|
|
||||||
|
TODO: write [great documentation](http://jacobian.org/writing/what-to-write/)
|
10
project.clj
Normal file
10
project.clj
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
(defproject yyy-data "0.1.0-SNAPSHOT"
|
||||||
|
:description "FIXME: write description"
|
||||||
|
:url "http://example.com/FIXME"
|
||||||
|
:license {:name "Eclipse Public License"
|
||||||
|
:url "http://www.eclipse.org/legal/epl-v10.html"}
|
||||||
|
:dependencies [[adl-support "0.1.0-SNAPSHOT"]
|
||||||
|
[generateme/fastmath "1.0.1"]
|
||||||
|
[org.clojure/clojure "1.8.0"]
|
||||||
|
[org.clojure/data.json "0.2.6"]
|
||||||
|
[net.mikera/core.matrix "0.62.0"]])
|
2878
resources/data/dg7.json
Normal file
2878
resources/data/dg7.json
Normal file
File diff suppressed because it is too large
Load diff
190
src/yyy_data/core.clj
Normal file
190
src/yyy_data/core.clj
Normal file
|
@ -0,0 +1,190 @@
|
||||||
|
(ns yyy-data.core
|
||||||
|
(:require [adl-support.utils :refer :all]
|
||||||
|
[fastmath.core :refer [radians degrees sin cos sqrt atan2]]
|
||||||
|
[clojure.core.matrix :as mx]
|
||||||
|
[clojure.data.json :as json]
|
||||||
|
[clojure.string :as s]))
|
||||||
|
|
||||||
|
(declare Cartesian Point)
|
||||||
|
|
||||||
|
;;; Coordinate system conversion cribbed from https://www.movable-type.co.uk/scripts/latlong-os-gridref.html
|
||||||
|
|
||||||
|
(def ellipsoids
|
||||||
|
"Ellipsoid parameters; major axis (a), minor axis (b), and flattening (f) for each ellipsoid."
|
||||||
|
{
|
||||||
|
:WGS84 { :a 6378137 :b 6356752.314245 :f (/ 1 298.257223563) }
|
||||||
|
:Airy1830 { :a 6377563.396 :b 6356256.909 :f (/ 1 299.3249646) }
|
||||||
|
:AiryModified { :a 6377340.189 :b 6356034.448 :f (/ 1 299.3249646) }
|
||||||
|
:Bessel1841 { :a 6377397.155 :b 6356078.962818 :f (/ 1 299.1528128) }
|
||||||
|
:Clarke1866 { :a 6378206.4 :b 6356583.8 :f (/ 1 294.978698214) }
|
||||||
|
:Clarke1880IGN { :a 6378249.2 :b 6356515.0 :f (/ 1 293.466021294) }
|
||||||
|
:GRS80 { :a 6378137 :b 6356752.314140 :f (/ 1 298.257222101) }
|
||||||
|
:Intl1924 { :a 6378388 :b 6356911.946 :f (/ 1 297) } ;; aka Hayford
|
||||||
|
:WGS72 { :a 6378135 :b 6356750.5 :f (/ 1 298.26) }
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
(def datums
|
||||||
|
"Datums; with associated ellipsoid, and Helmert transform parameters to convert from WGS 84 into
|
||||||
|
given datum.
|
||||||
|
|
||||||
|
Note that precision of various datums will vary, and WGS-84 (original) is not defined to be
|
||||||
|
accurate to better than ±1 metre. No transformation should be assumed to be accurate to better
|
||||||
|
than a meter; for many datums somewhat less.
|
||||||
|
|
||||||
|
Yes, I know that the plural of datums is data..."
|
||||||
|
{
|
||||||
|
;; transforms: t in metres, s in ppm, r in arcseconds tx ty tz s rx ry rz
|
||||||
|
:ED50 { :key :ED50 :ellipsoid (ellipsoids :Intl1924) :transform { :tx 89.5, :ty 93.8 :tz 123.1 :s -1.2 :rx 0.0 :ry 0.0 :rz 0.156 }}
|
||||||
|
:Irl1975 { :key :Irl1975 :ellipsoid (ellipsoids :AiryModified) :transform { :tx -482.530 :ty 130.596 :tz -564.557 :s -8.150 :rx -1.042 :ry -0.214 :rz -0.631 }}
|
||||||
|
:NAD27 { :key :NAD27 :ellipsoid (ellipsoids :Clarke1866) :transform { :tx 8 :ty -160 :tz -176 :s 0 :rx 0 :ry 0 :rz 0 }}
|
||||||
|
:NAD83 { :key :NAD83 :ellipsoid (ellipsoids :GRS80) :transform { :tx 1.004 :ty -1.910 :tz -0.515 :s -0.0015 :rx 0.0267 :ry 0.00034:rz 0.011 }}
|
||||||
|
:NTF { :key :NTF :ellipsoid (ellipsoids :Clarke1880IGN) :transform { :tx 168 :ty 60 :tz -320 :s 0 :rx 0 :ry 0 :rz 0 }}
|
||||||
|
:OSGB36 { :key :OSGB36 :ellipsoid (ellipsoids :Airy1830) :transform { :tx -446.448 :ty 125.157 :tz -542.060 :s 20.4894 :rx -0.1502 :ry -0.2470 :rz -0.8421 }}
|
||||||
|
:Potsdam { :key :Potsdam :ellipsoid (ellipsoids :Bessel1841) :transform { :tx -582 :ty -105 :tz -414 :s -8.3 :rx 1.04 :ry 0.35 :rz -3.08 }}
|
||||||
|
:TokyoJapan { :key :TokyoJapan :ellipsoid (ellipsoids :Bessel1841) :transform { :tx 148 :ty -507 :tz -685 :s 0 :rx 0 :ry 0 :rz 0 }}
|
||||||
|
:WGS72 { :key :WGS72 :ellipsoid (ellipsoids :WGS72) :transform { :tx 0 :ty 0 :tz -4.5 :s -0.22 :rx 0 :ry 0 :rz 0.554 }}
|
||||||
|
:WGS84 { :key :WGS84 :ellipsoid (ellipsoids :WGS84) :transform { :tx 0.0 :ty 0.0 :tz 0.0 :s 0.0 :rx 0.0 :ry 0.0 :rz 0.0 }}
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
(defprotocol Location
|
||||||
|
"A location on the surface of the earth"
|
||||||
|
(datum [l])
|
||||||
|
(datum-key [l])
|
||||||
|
(ellipsoid [l])
|
||||||
|
(grid-x [l])
|
||||||
|
(grid-y [l])
|
||||||
|
(latitude [l])
|
||||||
|
(longitude [l])
|
||||||
|
(to-cartesian [l])
|
||||||
|
(to-point [l])
|
||||||
|
(to-point [l d]))
|
||||||
|
|
||||||
|
|
||||||
|
(defrecord Cartesian
|
||||||
|
[x y z]
|
||||||
|
Location
|
||||||
|
;; datum is a bit meaningless for a Cartesian; get the default.
|
||||||
|
(datum [x] (datums :WGS84))
|
||||||
|
(datum-key [x] :WGS84)
|
||||||
|
(ellipsoid [x] (:ellipsoid (datum x)))
|
||||||
|
;; I already am cartesian; return myself
|
||||||
|
(to-cartesian [x] x)
|
||||||
|
(to-point [this datum] (let
|
||||||
|
[a (:a (:ellipsoid datum))
|
||||||
|
b (:b (:ellipsoid datum))
|
||||||
|
f (:f (:ellipsoid datum))
|
||||||
|
e2 (- (* 2 f) (* f f)) ;; first eccentricity squared
|
||||||
|
ε2 (/ e2 (- 1 e2)) ;; second eccentricity squared
|
||||||
|
p (sqrt (+ (* (:x this) (:x this)) (* (:y this) (:y this))))
|
||||||
|
;; distance from minor radius
|
||||||
|
R (sqrt (+ (* p p) (* (:z this) (:z this))))
|
||||||
|
;; polar radius
|
||||||
|
tanβ (* (/ (* b (:z this))(* a p)) (/ (* b (+ 1 ε2)) R))
|
||||||
|
sinβ (/ tanβ (sqrt (+ 1 (* tanβ tanβ))))
|
||||||
|
cosβ (/ sinβ tanβ)
|
||||||
|
φ (if
|
||||||
|
(Double/isNaN cosβ) 0
|
||||||
|
(atan2 (+ z (* ε2 b sinβ sinβ sinβ))
|
||||||
|
(- p (* e2 a cosβ cosβ cosβ))))
|
||||||
|
λ (atan2 (:y this) (:x this))
|
||||||
|
v (/ a (sqrt (- 1 (* e2 (sin φ) (sin φ)))))]
|
||||||
|
(Point. (degrees φ) (degrees λ) datum)))
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
(defn inverse-transform [t]
|
||||||
|
"Return a transform which is the inverse of `t`. More generally,
|
||||||
|
expects a map `t` whose values are numbers, and returns a map which has
|
||||||
|
for each key in `t` a number which is the inverse of the value of the
|
||||||
|
same key in `t`."
|
||||||
|
(reduce
|
||||||
|
merge
|
||||||
|
{}
|
||||||
|
(map
|
||||||
|
#(if (number? (t %)) (hash-map % (- 0 (t %))))
|
||||||
|
(keys t))))
|
||||||
|
|
||||||
|
;; (inverse-transform { :tx 89.5, :ty 93.8 :tz 123.1 :s -1.2 :rx 0.0 :ry 0.0 :rz 0.156 })
|
||||||
|
|
||||||
|
(defrecord Point
|
||||||
|
"A point with an `x` co-ordinate, a `y` co-ordinate, and a datum `d`. We're
|
||||||
|
agnostic as to whether `d` is passed as a keyword or a map, but it must be
|
||||||
|
taken from `datums`, q.v."
|
||||||
|
[x y d]
|
||||||
|
Location
|
||||||
|
(datum [x]
|
||||||
|
(cond
|
||||||
|
(keyword? (:d x))
|
||||||
|
(datums (:d x))
|
||||||
|
(map? (:d x))
|
||||||
|
(:d x)))
|
||||||
|
(datum-key [x]
|
||||||
|
(cond
|
||||||
|
(keyword? (:d x))
|
||||||
|
(:d x)
|
||||||
|
(map? (:d x))
|
||||||
|
(:key (:d x))))
|
||||||
|
(ellipsoid [x]
|
||||||
|
(:ellipsoid (datum [x])))
|
||||||
|
(to-cartesian [x]
|
||||||
|
(let [φ (radians (latitude x))
|
||||||
|
λ (radians (longitude x))
|
||||||
|
h 0
|
||||||
|
a (:a (:ellipsoid (:datum x)))
|
||||||
|
f (:f (:ellipsoid (:datum x)))
|
||||||
|
sinφ (sin φ)
|
||||||
|
cosφ (cos φ)
|
||||||
|
sinλ (sin λ)
|
||||||
|
cosλ (cos λ)
|
||||||
|
e2 (- (* 2 f) (* f f))
|
||||||
|
v (/ a (sqrt (- 1 (* e2 sinφ sinφ))))]
|
||||||
|
(Cartesian.
|
||||||
|
(* (+ v h) cosφ cosλ)
|
||||||
|
(* (+ v h) cosφ sinλ)
|
||||||
|
(* v (+ h (- 1 e2)) sinφ))))
|
||||||
|
(to-point [x] x)
|
||||||
|
(to-point [x new-datum]
|
||||||
|
(let [od (datum x)
|
||||||
|
nd (if (keyword? new-datum) (datums new-datum) new-datum)
|
||||||
|
c (to-cartesian x)]
|
||||||
|
(cond
|
||||||
|
(= od nd) x
|
||||||
|
(= (:key od) :WGS84) (to-point
|
||||||
|
(apply-transform c (:transform nd)))
|
||||||
|
(= (:key nd) :WGS84) (to-point
|
||||||
|
(apply-transform
|
||||||
|
c
|
||||||
|
(inverse-transformation (:datum x))))
|
||||||
|
true
|
||||||
|
(to-datum (to-datum x :WGS84) nd)))))
|
||||||
|
|
||||||
|
(latitude [x]
|
||||||
|
(:y (to-datum
|
||||||
|
;; (defn os-grid-x-to-lat-long
|
||||||
|
;; ([x y]
|
||||||
|
;; (os-grid-x-to-lat-long {:x x :y y})
|
||||||
|
;; ([point]
|
||||||
|
;; (let [datum
|
||||||
|
;; )
|
||||||
|
|
||||||
|
;; (defn os-grid-y-to-latitude
|
||||||
|
;; [y]
|
||||||
|
;; )
|
||||||
|
|
||||||
|
(defn
|
||||||
|
|
||||||
|
(defn post-code-data-to-addresses
|
||||||
|
[filename]
|
||||||
|
(map
|
||||||
|
(fn [a]
|
||||||
|
(s/join
|
||||||
|
(list
|
||||||
|
"insert into addresses (address:ellipsoid postcode}} latitude, longitude) values ('"
|
||||||
|
(:address %) "', '" (:postcode %)
|
||||||
|
"', " 0 "," 0 ");"))
|
||||||
|
)
|
||||||
|
(filter
|
||||||
|
#(= (:classification_code_description %) "Dwelling")
|
||||||
|
(:results (json/read-str (slurp filename) :key-fn #(keyword (.toLowerCase %)))))))
|
7
test/yyy_data/core_test.clj
Normal file
7
test/yyy_data/core_test.clj
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
(ns yyy-data.core-test
|
||||||
|
(:require [clojure.test :refer :all]
|
||||||
|
[adl-data.core :refer :all]))
|
||||||
|
|
||||||
|
(deftest a-test
|
||||||
|
(testing "FIXME, I fail."
|
||||||
|
(is (= 0 1))))
|
Loading…
Reference in a new issue